[src/netbsd-1-4]: src Pull up revision 1.6 (requested by mycroft):

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

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

description:
Pull up revision 1.6 (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:

 games/hunt/huntd/hunt.h |  4 ++--
 lib/libntp/msyslog.c    |  8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 5737df8180c7 -r d9e80d8dd428 games/hunt/huntd/hunt.h
--- a/games/hunt/huntd/hunt.h   Sun Jan 23 12:00:56 2000 +0000
+++ b/games/hunt/huntd/hunt.h   Sun Jan 23 12:01:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hunt.h,v 1.5 1998/09/13 15:27:28 hubertf Exp $ */
+/*     $NetBSD: hunt.h,v 1.5.2.1 2000/01/23 12:01:04 he Exp $  */
 
 /*
  *  Hunt
@@ -346,7 +346,7 @@
 
 extern char    *Sock_name, *Driver;
 
-extern int     errno, Nplayer, Num_fds, Socket, Status;
+extern int     Nplayer, Num_fds, Socket, Status;
 extern fd_set  Fds_mask, Have_inp;
 
 # ifdef INTERNET
diff -r 5737df8180c7 -r d9e80d8dd428 lib/libntp/msyslog.c
--- a/lib/libntp/msyslog.c      Sun Jan 23 12:00:56 2000 +0000
+++ b/lib/libntp/msyslog.c      Sun Jan 23 12:01:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msyslog.c,v 1.3 1998/03/06 18:17:15 christos Exp $     */
+/*     $NetBSD: msyslog.c,v 1.3.2.1 2000/01/23 12:01:12 he Exp $       */
 
 /*
  * msyslog - either send a message to the terminal or print it on
@@ -46,10 +46,7 @@
 
 u_long ntp_syslogmask =  ~ (u_long) 0;
 
-#ifndef VMS
-#ifndef SYS_WINNT
-extern int errno;
-#else
+#ifdef SYS_WINNT
 HANDLE  hEventSource;
 LPTSTR lpszStrings[1];
 static WORD event_type[] = {
@@ -58,7 +55,6 @@
        EVENTLOG_INFORMATION_TYPE, EVENTLOG_INFORMATION_TYPE, EVENTLOG_INFORMATION_TYPE,
 };
 #endif /* SYS_WINNT */
-#endif /* VMS */
 extern char *progname;
 
 #if defined(__STDC__)