r25474: Try and fix the build on Mac OS X 10.4.9.

Shuffle sa_family_t around.
Jeremy.
(This used to be commit f1b8c5de0ae96e04e340029f5cd544de9ac57b32)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index b084eed40cd62ffbe98b34136c14ab9eae6d6333..4f11e7a0932a4b6a50a0797db6b53e2db290281c 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1262,8 +1262,4 @@ void exit_server_fault(void) NORETURN_ATTRIBUTE ;
 #include "libnscd.h"
 #endif
 
-#ifndef HAVE_SA_FAMILY_T
-typedef unsigned short int sa_family_t;
-#endif
-
 #endif /* _INCLUDES_H */

diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h
index 70c3ec711c69cc28852e527d520619601977895b..1b442dd602d4ea1f8641102cb8cd8f5f6747debf 100644 (file)
--- a/source3/lib/replace/system/network.h
+++ b/source3/lib/replace/system/network.h
@@ -118,4 +118,8 @@ char *rep_inet_ntoa(struct in_addr ip);
 #define INET6_ADDRSTRLEN 46
 #endif
 
+#ifndef HAVE_SA_FAMILY_T
+typedef unsigned short int sa_family_t;
+#endif
+
 #endif