From 910f3846bb30636fe25bdc6e06e72d50c6779bd9 Mon Sep 17 00:00:00 2001
From: Dan Harkless <dan@harkless.org>
Date: Thu, 13 May 1999 01:31:00 +0000
Subject: [PATCH] Use "#include <errno.h>" instead of "extern int errno;".
 Suggested by Stephen Wilson Bailey <swb@nconnect.net>

---
 mts/sendmail/sendmail.c |    7 +++----
 mts/smtp/smtp.c         |    7 +++----
 sbr/error.c             |    2 +-
 uip/ftpsbr.c            |    3 +--
 uip/popsbr.c            |    3 +--
 uip/vmhsbr.c            |    3 +--
 zotnet/mts/client.c     |    2 --
 7 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/mts/sendmail/sendmail.c b/mts/sendmail/sendmail.c
index 7556503..1ff4138 100644
--- a/mts/sendmail/sendmail.c
+++ b/mts/sendmail/sendmail.c
@@ -9,6 +9,9 @@
 #include <mts/smtp/smtp.h>
 #include <zotnet/mts/mts.h>
 #include <signal.h>
+#ifdef MPOP
+#include <errno.h>
+#endif
 
 /*
  * This module implements an interface to SendMail very similar
@@ -74,10 +77,6 @@ static char *sm_moreply = "; ";
 
 struct smtp sm_reply;		/* global... */
 
-#ifdef MPOP
-extern int errno;
-#endif
-
 static int doingEHLO;
 
 #define	MAXEHLO	20
diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index f775638..e2f6574 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -9,6 +9,9 @@
 #include "smtp.h"
 #include <zotnet/mts/mts.h>
 #include <signal.h>
+#ifdef MPOP
+#include <errno.h>
+#endif
 
 /*
  * This module implements an interface to SendMail very similar
@@ -71,10 +74,6 @@ static char *sm_moreply = "; ";
 
 struct smtp sm_reply;		/* global... */
 
-#ifdef MPOP
-extern int errno;
-#endif
-
 
 #define	MAXEHLO	20
 
diff --git a/sbr/error.c b/sbr/error.c
index 0e02f2a..41f031a 100644
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -12,7 +12,7 @@
 # include <sys/uio.h>
 #endif
 
-extern int errno;
+#include <errno.h>
 
 
 /*
diff --git a/uip/ftpsbr.c b/uip/ftpsbr.c
index d36e0e5..671a533 100644
--- a/uip/ftpsbr.c
+++ b/uip/ftpsbr.c
@@ -27,6 +27,7 @@ extern int v_verbose;
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <errno.h>
 
 #if defined(BIND) && !defined(h_addr)
 # define h_addr	h_addr_list[0]
@@ -35,8 +36,6 @@ extern int v_verbose;
 #define	inaddr_copy(hp,sin) \
     memcpy((char *) &((sin)->sin_addr), (hp)->h_addr, (hp)->h_length)
 
-extern int errno;
-
 #define	start_tcp_client(sock,priv) \
     	socket (AF_INET, SOCK_STREAM, 0)
 
diff --git a/uip/popsbr.c b/uip/popsbr.c
index 6b026c6..0b0551d 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -22,12 +22,11 @@
 #include <h/popsbr.h>
 #include <h/signals.h>
 #include <signal.h>
+#include <errno.h>
 
 #define	TRM	"."
 #define	TRMLEN	(sizeof TRM - 1)
 
-extern int errno;
-
 static int poprint = 0;
 static int pophack = 0;
 
diff --git a/uip/vmhsbr.c b/uip/vmhsbr.c
index 664c388..8ef0310 100644
--- a/uip/vmhsbr.c
+++ b/uip/vmhsbr.c
@@ -12,6 +12,7 @@
 
 #include <h/mh.h>
 #include <h/vmhsbr.h>
+#include <errno.h>
 
 static char *types[] = {
     "OK",
@@ -24,8 +25,6 @@ static	FILE *fp = NULL;
 static int PEERrfd = NOTOK;
 static int PEERwfd = NOTOK;
 
-extern int  errno;
-
 /*
  * static prototypes
  */
diff --git a/zotnet/mts/client.c b/zotnet/mts/client.c
index 6d86057..b9679e9 100644
--- a/zotnet/mts/client.c
+++ b/zotnet/mts/client.c
@@ -35,8 +35,6 @@
 #define	MAXNETS      5
 #define	MAXHOSTS    25
 
-extern int errno;
-
 struct addrent {
     int a_addrtype;		/* assumes AF_INET for inet_netof () */
     union {
-- 
1.7.10.4