Portability fixes: don't declare errno ever

and don't declare sys_errlist unless you need to.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7336 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 115610437cc4da4d8b4b806fac0ef27ae8f5fbed..ce190ef3198c90259a1194ef4ddfd27d113db64a 100644 (file)
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 18 18:33:18 1996  Sam Hartman  <hartmans@zygorthian-space-raiders.MIT.EDU>
+
+       * cmds.c: Handle sys_errlist and remove declaration of errno.
+
+       * configure.in: Check to see if we need to declare sys_errlist.
+
+       * ftp.c secure.c: Only define sys_errlist if needed
+
 Thu Jan 18 11:55:50 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * configure.in: Check for sys/select.h

diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c
index de7e4b1176cf22cf3506b3bad1bd43a279e92854..3687ceae01500452eb82353a7ef566c9e7e69593 100644 (file)
--- a/src/appl/gssftp/ftp/cmds.c
+++ b/src/appl/gssftp/ftp/cmds.c
@@ -71,8 +71,10 @@ extern       char *home;
 extern char *remglob();
 extern char *getenv();
 #define strerror(error) (sys_errlist[error])
+#ifdef NEED_SYS_ERRLIST
 extern char *sys_errlist[];
-extern int  errno;
+#endif
+
 extern off_t restart_point;
 extern char reply_string[];
 

diff --git a/src/appl/gssftp/ftp/configure.in b/src/appl/gssftp/ftp/configure.in
index d50f5ab9a421cb0645c9e6dd1339eb26f0554912..33090755de3d60a155a99217a477d1ccd09e7bb0 100644 (file)
--- a/src/appl/gssftp/ftp/configure.in
+++ b/src/appl/gssftp/ftp/configure.in
@@ -5,6 +5,7 @@ AC_PROG_INSTALL
 KRB5_SIGTYPE
 CHECK_SIGPROCMASK
 CHECK_WAIT_TYPE
+DECLARE_SYS_ERRLIST
 AC_FUNC_VFORK
 AC_HAVE_FUNCS(getcwd getdtablesize)
 AC_CHECK_HEADERS(sys/select.h)

diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index 0e8a1a9f866ae50b07b63bd6b71afdc91aca73fd..3c701d4f9af0c3463062be11cb3f9da089e462e4 100644 (file)
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -121,7 +121,10 @@ sig_t      lostpeer();
 off_t  restart_point = 0;
 
 #define strerror(error) (sys_errlist[error])
+#ifdef NEED_SYS_ERRLIST
 extern char *sys_errlist[];
+#endif
+
 extern int connected, errno;
 
 #define herror()       printf("unknown host\n")

diff --git a/src/appl/gssftp/ftp/secure.c b/src/appl/gssftp/ftp/secure.c
index 445133975af47bfee13a4385bd2d9874d7bcaddb..07598dabf54f3598c37b9b85a09ee240bf1b9512 100644 (file)
--- a/src/appl/gssftp/ftp/secure.c
+++ b/src/appl/gssftp/ftp/secure.c
@@ -27,8 +27,10 @@ extern gss_ctx_id_t gcontext;
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <errno.h>
-extern int errno;
+
+#ifdef NEED_SYS_ERRLIST
 extern char *sys_errlist[];
+#endif
 
 extern struct  sockaddr_in hisaddr;
 extern struct  sockaddr_in myaddr;