From: Jim Rees <rees@umich.edu>
Date: Wed, 12 Jul 2006 14:42:25 +0000 (+0000)
Subject: STABLE14-fix-includes-merge-20060712
X-Git-Tag: openafs-stable-1_4_2b3~47
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b02c8d517eeb96932c78ebb6fe3001c8db06d8d6;p=packages%2Fo%2Fopenafs.git

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 60d0cf141..3d074152a 100644
--- 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) () );