STABLE14-fix-includes-merge-20060712

Now that we include arpa/inet.h, also include its prerequisites,
and fix the ordering.

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 60d0cf141dd283b884e499a5a8035ca31056c9a0..3d074152abc6946d5b0341d00e26f9426975cfe6 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -22,15 +22,22 @@
 
 /* logging defines
  */
+#ifndef AFS_NT40_ENV
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h> /* for inet_ntoa() */
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
+
 extern int LogLevel;
 extern int mrafsStyleLogs;
 #ifndef AFS_NT40_ENV
 extern int serverLogSyslog;
 extern int serverLogSyslogFacility;
 extern char *serverLogSyslogTag;
-#include <arpa/inet.h> /* for inet_ntoa() */
 #endif
 extern void vFSLog(const char *format, va_list args);
 extern void SetLogThreadNumProgram(int (*func) () );