From 3bf2b1b47fd8739ba43a097666973256e152bb9b Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 17 Dec 2003 21:18:12 +0000
Subject: [PATCH] errno may not be a variable; users must include errno.h
 instead of declaring it like `extern int errno'.

---
 src/client/main.c           | 2 --
 src/lib/commands/info.c     | 5 +----
 src/lib/common/hours.c      | 2 +-
 src/lib/common/log.c        | 6 ------
 src/lib/gen/io.c            | 2 --
 src/lib/gen/io_mask.c       | 2 --
 src/lib/player/accept.c     | 1 -
 src/lib/player/recvclient.c | 1 -
 8 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/client/main.c b/src/client/main.c
index 4b09a432..ed8e4db4 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -63,8 +63,6 @@
 HANDLE hStdIn;
 #endif
 
-extern int errno;
-
 #define	RETRY	3
 
 int interrupt;
diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c
index 37d4af09..bc165e7a 100644
--- a/src/lib/commands/info.c
+++ b/src/lib/commands/info.c
@@ -36,6 +36,7 @@
 
 #include "misc.h"
 #include "player.h"
+#include <errno.h>
 #ifdef Rel4
 #include <string.h>
 #endif /* Rel4 */
@@ -59,8 +60,6 @@ static int printdir(void);
 static
 s_char *
 lowerit(s_char *buf, int n, s_char *orig)
-
-
 {				/* converts a string to lower case */
     /* lower case output buffer */
     /* size of output buffer */
@@ -97,7 +96,6 @@ strnccmp(s_char *s1, s_char *s2, int n)
 int
 info(void)
 {
-    extern int errno;
     extern s_char *infodir;
 #if (!defined linux) && (!defined FBSD) && (!defined __linux__) && (!defined __ppc__)
     extern s_char *sys_errlist[];
@@ -381,7 +379,6 @@ apro(void)
 int
 info(void)
 {
-    extern int errno;
     extern s_char *infodir;
     s_char buf[255];
     FILE *fp;
diff --git a/src/lib/common/hours.c b/src/lib/common/hours.c
index 93737ca6..f0364435 100644
--- a/src/lib/common/hours.c
+++ b/src/lib/common/hours.c
@@ -33,6 +33,7 @@
  *     Steve McClure, 1998
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include "misc.h"
 #include "nat.h"
@@ -59,7 +60,6 @@ int
 gamehours(time_t now, int *hour)
 {
     extern s_char *game_days, *game_hours;
-    extern int errno;
     extern struct tm *localtime(const time_t *);
     register s_char *bp;
     register struct tm *tm;
diff --git a/src/lib/common/log.c b/src/lib/common/log.c
index 5d6b3140..69cfcbaf 100644
--- a/src/lib/common/log.c
+++ b/src/lib/common/log.c
@@ -82,9 +82,6 @@ logerror(s_char *format, ...)
 #if !defined(Rel4) && !defined(__linux__) && !defined(__ppc__)
     extern s_char *sys_errlist[];
 #endif
-#ifndef sgi
-    extern int errno;
-#endif /* sgi */
     va_list list;
     time_t now;
     s_char buf[512];
@@ -131,9 +128,6 @@ filelogerror(s_char *format, ...)
 #if !defined(Rel4) && !defined(__linux__) && !defined(__ppc__)
     extern s_char *sys_errlist[];
 #endif /* Rel4 */
-#ifndef sgi
-    extern int errno;
-#endif /* sgi */
     va_list list;
     time_t now;
     s_char buf[512];
diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c
index 286d4aa1..72f7694f 100644
--- a/src/lib/gen/io.c
+++ b/src/lib/gen/io.c
@@ -81,8 +81,6 @@ struct iop {
     int (*notify) ();
 };
 
-extern int errno;
-
 void
 io_init(void)
 {
diff --git a/src/lib/gen/io_mask.c b/src/lib/gen/io_mask.c
index f64d57e8..f83f7d24 100644
--- a/src/lib/gen/io_mask.c
+++ b/src/lib/gen/io_mask.c
@@ -38,8 +38,6 @@
 #include "empio.h"
 #include "io_mask.h"
 
-extern int errno;
-
 struct io_mask *
 iom_create(int what)
 {
diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 2ef5e61a..29d6560c 100644
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -190,7 +190,6 @@ void
 player_accept(void *argv)
 {
     extern s_char *loginport;
-    extern int errno;
     struct sockaddr_in sin;
     struct servent *sp;
     int s;
diff --git a/src/lib/player/recvclient.c b/src/lib/player/recvclient.c
index e5a6dbc8..00c7a989 100644
--- a/src/lib/player/recvclient.c
+++ b/src/lib/player/recvclient.c
@@ -44,7 +44,6 @@
 int
 recvclient(s_char *cmd, int size)
 {
-    extern int errno;
     int count;
 
     if (player->aborted)