add errno.h in file.h and remove it from other places.

diff --git a/src/compress.c b/src/compress.c
index 7b73e315faa843bdfe044ad896408349ea7af0ad..514e9db85ea4f8a3d74f495b68a604e06e434352 100644 (file)
--- a/src/compress.c
+++ b/src/compress.c
@@ -6,9 +6,6 @@
  *                                         using method, return sizeof new
  */
 #include "file.h"
-#ifdef __CYGWIN__
-#include <errno.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -19,7 +16,7 @@
 #include <sys/wait.h>
 #endif
 #ifndef lint
-FILE_RCSID("@(#)$Id: compress.c,v 1.15 1999/11/28 20:02:29 christos Exp $")
+FILE_RCSID("@(#)$Id: compress.c,v 1.16 2000/05/14 22:58:53 christos Exp $")
 #endif
 
 

diff --git a/src/file.c b/src/file.c
index 4484daaf1b408dad6ef11cdb5ca00bb0d1241010..f46110bdb73c0bf8686dc4b9c4d8c3247492418f 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -25,9 +25,6 @@
  * 4. This notice may not be removed or altered.
  */
 #include "file.h"
-#ifdef __CYGWIN__
-#include <errno.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -58,7 +55,7 @@
 #include "patchlevel.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$Id: file.c,v 1.51 2000/05/14 17:58:36 christos Exp $")
+FILE_RCSID("@(#)$Id: file.c,v 1.52 2000/05/14 22:58:53 christos Exp $")
 #endif /* lint */
 
 

diff --git a/src/file.h b/src/file.h
index 20ad8d0bf526d975600935ce974a78839bfd6b69..1cca4e7e95335bdbe524e09a55af4d8c0715fc5e 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.31 2000/04/11 02:32:35 christos Exp $
+ * @(#)$Id: file.h,v 1.32 2000/05/14 22:58:53 christos Exp $
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
@@ -91,6 +91,7 @@ struct magic {
 
 
 #include <stdio.h>     /* Include that here, to make sure __P gets defined */
+#include <errno.h>
 
 #ifndef __P
 # if defined(__STDC__) || defined(__cplusplus)
@@ -121,8 +122,6 @@ extern uint32 signextend    __P((struct magic *, unsigned int32));
 extern int internatmagic       __P((unsigned char *, int));
 extern void tryelf             __P((int, unsigned char *, int));
 
-extern int errno;              /* Some unixes don't define this..      */
-
 extern char *progname;         /* the program name                     */
 extern const char *magicfile;  /* name of the magic file               */
 extern int lineno;             /* current line number in magic file    */

diff --git a/src/fsmagic.c b/src/fsmagic.c
index 7b7896736484447d5610f43c23d14b9e7c7c2a65..b072dc56cfb527712e5e69b47a2a00d4463b1836 100644 (file)
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -26,9 +26,6 @@
  */
 
 #include "file.h"
-#ifdef __CYGWIN__
-#include <errno.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -57,7 +54,7 @@
 #undef HAVE_MAJOR
 
 #ifndef        lint
-FILE_RCSID("@(#)$Id: fsmagic.c,v 1.31 2000/04/11 02:32:35 christos Exp $")
+FILE_RCSID("@(#)$Id: fsmagic.c,v 1.32 2000/05/14 22:58:54 christos Exp $")
 #endif /* lint */
 
 int