From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 11 Nov 2003 20:01:45 +0000 (+0000)
Subject: Include "file.h" first because it includes "config.h" and this needs to
X-Git-Tag: FILE5_05~917
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ed5fe6c92f1d5df4e69c7506dd465fc72d2b964;p=file

Include "file.h" first because it includes "config.h" and this needs to
come first.
---

diff --git a/src/apptype.c b/src/apptype.c
index fdd17ea8..73b06875 100644
--- a/src/apptype.c
+++ b/src/apptype.c
@@ -24,14 +24,15 @@
  * 
  */
 
+#include "file.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: apptype.c,v 1.5 2003/10/14 19:29:55 christos Exp $")
+FILE_RCSID("@(#)$Id: apptype.c,v 1.6 2003/11/11 20:01:45 christos Exp $")
 #endif /* lint */
 
 #ifdef __EMX__
diff --git a/src/ascmagic.c b/src/ascmagic.c
index a9c1e2e3..6cab46a8 100644
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -41,8 +41,8 @@
  * international characters, now subsumed into this file.
  */
 
-#include "magic.h"
 #include "file.h"
+#include "magic.h"
 #include <stdio.h>
 #include <string.h>
 #include <memory.h>
@@ -54,7 +54,7 @@
 #include "names.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: ascmagic.c,v 1.38 2003/05/23 21:31:58 christos Exp $")
+FILE_RCSID("@(#)$Id: ascmagic.c,v 1.39 2003/11/11 20:01:45 christos Exp $")
 #endif	/* lint */
 
 typedef unsigned long unichar;
diff --git a/src/compress.c b/src/compress.c
index 8c88c4fe..41daf48a 100644
--- a/src/compress.c
+++ b/src/compress.c
@@ -37,8 +37,8 @@
  *	uncompress(method, old, n, newch) - uncompress old into new, 
  *					    using method, return sizeof new
  */
-#include "magic.h"
 #include "file.h"
+#include "magic.h"
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -56,7 +56,7 @@
 #endif
 
 #ifndef lint
-FILE_RCSID("@(#)$Id: compress.c,v 1.34 2003/10/14 19:29:55 christos Exp $")
+FILE_RCSID("@(#)$Id: compress.c,v 1.35 2003/11/11 20:01:45 christos Exp $")
 #endif
 
 
diff --git a/src/file.c b/src/file.c
index 6ff8c036..c61ce994 100644
--- a/src/file.c
+++ b/src/file.c
@@ -34,8 +34,8 @@
  * file - find type of a file or files - main program.
  */
 
-#include "magic.h"
 #include "file.h"
+#include "magic.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -72,7 +72,7 @@
 #include "patchlevel.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: file.c,v 1.86 2003/10/27 18:09:41 christos Exp $")
+FILE_RCSID("@(#)$Id: file.c,v 1.87 2003/11/11 20:01:45 christos Exp $")
 #endif	/* lint */
 
 
diff --git a/src/funcs.c b/src/funcs.c
index 12aff1d4..f15616d6 100644
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -26,13 +26,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "magic.h"
 #include "file.h"
+#include "magic.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
+#ifndef	lint
+FILE_RCSID("@(#)$Id: funcs.c,v 1.11 2003/11/11 20:01:46 christos Exp $")
+#endif	/* lint */
 /*
  * Like printf, only we print to a buffer and advance it.
  */
diff --git a/src/is_tar.c b/src/is_tar.c
index 8d023529..fbee318a 100644
--- a/src/is_tar.c
+++ b/src/is_tar.c
@@ -42,15 +42,15 @@
  * for file command by Ian Darwin.
  */
 
-#include "magic.h"
 #include "file.h"
+#include "magic.h"
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include "tar.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$Id: is_tar.c,v 1.23 2003/10/14 19:29:55 christos Exp $")
+FILE_RCSID("@(#)$Id: is_tar.c,v 1.24 2003/11/11 20:01:46 christos Exp $")
 #endif
 
 #define	isodigit(c)	( ((c) >= '0') && ((c) <= '7') )
diff --git a/src/magic.c b/src/magic.c
index 87f5529e..1c958033 100644
--- a/src/magic.c
+++ b/src/magic.c
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#include "magic.h"
 #include "file.h"
+#include "magic.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,7 +65,7 @@
 #include "patchlevel.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: magic.c,v 1.15 2003/10/15 01:51:24 christos Exp $")
+FILE_RCSID("@(#)$Id: magic.c,v 1.16 2003/11/11 20:01:46 christos Exp $")
 #endif	/* lint */
 
 #ifdef __EMX__