From: Charles Longeau <chl@tuxfamily.org>
Date: Sat, 16 Jan 2010 17:45:11 +0000 (+0000)
Subject: * bring back some fixes from OpenBSD:
X-Git-Tag: FILE5_05~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48636dbfa80f33b61407041018037de69765406d;p=file

* bring back some fixes from OpenBSD:
  - make gcc2 builds file
  - fix typos in a magic file comment
---

diff --git a/ChangeLog b/ChangeLog
index 44ce2bc9..0c1e6e3e 100644
--- 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 99d77cc3..8d60f69f 100644
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: filesystems,v 1.54 2009/11/06 13:53:52 christos Exp $
+# $File: filesystems,v 1.55 2010/01/16 17:45:12 chl 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 b86fc174..c07f2d45 100644
--- a/src/file.h
+++ b/src/file.h
@@ -27,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$File: file.h,v 1.123 2009/10/19 13:10:20 christos Exp $
+ * @(#)$File: file.h,v 1.124 2010/01/16 17:45:12 chl 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