[src/netbsd-1-4]: src/usr.bin/file Pull up revision 1.18 (requested by mycroft):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/91a3d03a5499
branches:  netbsd-1-4
changeset: 470153:91a3d03a5499
user:      he <he%NetBSD.org@localhost>
date:      Sun Jan 23 12:01:59 2000 +0000

description:
Pull up revision 1.18 (requested by mycroft):
  Always do the errno indirection hack, so that non-threaded
  libraries get the right errno value when linked with -lpthread.
  This means "always include <errno.h> and never declare errno
  yourself".

diffstat:

 usr.bin/file/file.h |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 7f4bc064c4f7 -r 91a3d03a5499 usr.bin/file/file.h
--- a/usr.bin/file/file.h       Sun Jan 23 12:01:51 2000 +0000
+++ b/usr.bin/file/file.h       Sun Jan 23 12:01:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: file.h,v 1.13 1998/09/30 18:51:13 thorpej Exp $        */
+/*     $NetBSD: file.h,v 1.13.2.1 2000/01/23 12:01:59 he Exp $ */
 
 /*
  * file.h - definitions for file(1) program
@@ -80,6 +80,7 @@
 };
 
 #include <stdio.h>     /* Include that here, to make sure __P gets defined */
+#include <errno.h>
 
 #ifndef __P
 # if __STDC__ || __cplusplus
@@ -111,8 +112,6 @@
 extern void tryelf             __P((int, 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    */