* bring back some fixes from OpenBSD:

  - make gcc2 builds file
  - fix typos in a magic file comment

diff --git a/ChangeLog b/ChangeLog
index 44ce2bc9ad66b2d29538f978ae631fd4f82def00..0c1e6e3ef90d9dc013c766396497b5aae9550d14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-16  18:42  Charles Longeau <chl@tuxfamily.org>
+
+       * bring back some fixes from OpenBSD:
+               - make gcc2 builds file
+               - fix typos in a magic file comment
+
 2009-11-17  18:35  Christos Zoulas <christos@zoulas.com<
 
        * ctime/asctime can return NULL on some OS's although

diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 64742c347655345b6e604024c5afe65ed11a1d22..4cb5221e798dc4b838b27cb9df33891b264044bc 100644 (file)
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: filesystems,v 1.53 2009/09/28 21:26:59 christos Exp $
+# $File: filesystems,v 1.54 2009/11/06 13:53:52 christos Exp $
 # filesystems:  file(1) magic for different filesystems
 #
 0      string  \366\366\366\366        PC formatted floppy with no filesystem
@@ -203,7 +203,7 @@
 # http://www.bcdwb.de/bcdw/index_e.htm
 >3     string  BCDL                            
 >>498  string  BCDL\ \ \ \ BIN                 \b, Bootable CD Loader (1.50Z)
-# mbr partion table entries
+# mbr partition table entries
 # OEM-ID does not contain MicroSoft,NEWLDR,DOS,SYSLINUX,or MTOOLs
 >3                     string          !MS
 >>3                    string          !SYSLINUX
@@ -257,7 +257,7 @@
 #>>>>>>>>>>>>496               ubeshort&1023   x       \b, startcylinder? %d
 >>>>>>>>>>>>502                ulelong         x       \b, startsector %u
 >>>>>>>>>>>>506                ulelong         x       \b, %u sectors
-# mbr partion table entries end
+# mbr partition table entries end
 # http://www.acronis.de/
 #FAT label=ACRONIS\ SZ
 #OEM-ID=BOOTWIZ0

diff --git a/src/file.h b/src/file.h
index 6254a5f3dc5b1f83fc788ae8344eab65966c2f23..f3dda4bd94bef3af1d5184c11fa1f77125dfd1c3 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -27,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$File: file.h,v 1.122 2009/07/15 15:16:52 christos Exp $
+ * @(#)$File: file.h,v 1.123 2009/10/19 13:10:20 christos Exp $
  */
 
 #ifndef __file_h__
@@ -441,7 +441,7 @@ size_t strlcat(char *dst, const char *src, size_t siz);
 #endif
 
 #ifndef __cplusplus
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ >= 3)
 #define FILE_RCSID(id) \
 static const char rcsid[] __attribute__((__used__)) = id;
 #else