From 569fd109a4d15218df6dc0dfa542b4ae51597c36 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Mon, 16 Dec 1996 22:55:33 +0000
Subject: [PATCH] changed order of includes

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1123 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/common/glob.c   |  6 +++---
 appl/ftp/ftp/ftp.c       |  6 +-----
 appl/ftp/ftp/ftp_locl.h  |  6 +++---
 appl/ftp/ftpd/auth.c     |  3 +++
 appl/ftp/ftpd/extern.h   |  2 +-
 lib/kafs/afssys.c        | 19 +++++++++----------
 lib/roken/getusershell.c |  7 +++++++
 lib/roken/glob.c         |  6 +++---
 8 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/appl/ftp/common/glob.c b/appl/ftp/common/glob.c
index 05aee60c7..79ae54486 100644
--- a/appl/ftp/common/glob.c
+++ b/appl/ftp/common/glob.c
@@ -66,12 +66,12 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 #include <ctype.h>
 #ifdef HAVE_DIRENT_H
diff --git a/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c
index 94459811f..df7693b62 100644
--- a/appl/ftp/ftp/ftp.c
+++ b/appl/ftp/ftp/ftp.c
@@ -34,10 +34,6 @@
 #include "ftp_locl.h"
 RCSID("$Id$");
 
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
 struct	sockaddr_in hisctladdr;
 struct	sockaddr_in data_addr;
 int	data = -1;
@@ -1585,7 +1581,7 @@ gunique(char *local)
 	while (!d) {
 		if (++count == 100) {
 			printf("runique: can't find unique file name.\n");
-			return ((char *) 0);
+			return NULL;
 		}
 		*cp++ = ext;
 		*cp = '\0';
diff --git a/appl/ftp/ftp/ftp_locl.h b/appl/ftp/ftp/ftp_locl.h
index f1c18339a..83ae9ef73 100644
--- a/appl/ftp/ftp/ftp_locl.h
+++ b/appl/ftp/ftp/ftp_locl.h
@@ -65,6 +65,9 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -80,9 +83,6 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/appl/ftp/ftpd/auth.c b/appl/ftp/ftpd/auth.c
index ca49de22d..7c102f198 100644
--- a/appl/ftp/ftpd/auth.c
+++ b/appl/ftp/ftpd/auth.c
@@ -47,6 +47,9 @@ RCSID("$Id$");
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
diff --git a/appl/ftp/ftpd/extern.h b/appl/ftp/ftpd/extern.h
index fbd5afce3..6b128e115 100644
--- a/appl/ftp/ftpd/extern.h
+++ b/appl/ftp/ftpd/extern.h
@@ -72,7 +72,7 @@ void	renamecmd(char *, char *);
 char   *renamefrom(char *);
 void	reply(int, const char *, ...);
 void	retrieve(char *, char *);
-void	send_file_list(char *);
+void	send_file_list(char *, int minus_l);
 void	setproctitle(const char *, ...);
 void	statcmd(void);
 void	statfilecmd(char *);
diff --git a/lib/kafs/afssys.c b/lib/kafs/afssys.c
index 890c0b8ab..631b962fa 100644
--- a/lib/kafs/afssys.c
+++ b/lib/kafs/afssys.c
@@ -50,6 +50,15 @@ RCSID("$Id$");
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -65,16 +74,6 @@ RCSID("$Id$");
 #include <errno.h>
 #include <signal.h>
 
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
 #ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
 #endif
diff --git a/lib/roken/getusershell.c b/lib/roken/getusershell.c
index beeee21ca..009d7df82 100644
--- a/lib/roken/getusershell.c
+++ b/lib/roken/getusershell.c
@@ -44,8 +44,15 @@ RCSID("$Id$");
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 
 #ifndef __P
 #define __P(X) X
diff --git a/lib/roken/glob.c b/lib/roken/glob.c
index 05aee60c7..79ae54486 100644
--- a/lib/roken/glob.c
+++ b/lib/roken/glob.c
@@ -66,12 +66,12 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 #include <ctype.h>
 #ifdef HAVE_DIRENT_H