svn commit: samba r25474 - in branches: SAMBA_3_2/source/include SAMBA_3_2/source/lib/replace/system SAMBA_3_2_0/source/include SAMBA_3_2_0/source/lib/replace/system

[jra at samba.org]

Author: jra
Date: 2007-10-02 20:04:14 +0000 (Tue, 02 Oct 2007)
New Revision: 25474

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25474

Log:
Try and fix the build on Mac OS X 10.4.9.
Shuffle sa_family_t around.
Jeremy.

Modified:
   branches/SAMBA_3_2/source/include/includes.h
   branches/SAMBA_3_2/source/lib/replace/system/network.h
   branches/SAMBA_3_2_0/source/include/includes.h
   branches/SAMBA_3_2_0/source/lib/replace/system/network.h


Changeset:
Modified: branches/SAMBA_3_2/source/include/includes.h
===================================================================
--- branches/SAMBA_3_2/source/include/includes.h	2007-10-02 19:50:53 UTC (rev 25473)
+++ branches/SAMBA_3_2/source/include/includes.h	2007-10-02 20:04:14 UTC (rev 25474)
@@ -1262,8 +1262,4 @@
 #include "libnscd.h"
 #endif
 
-#ifndef HAVE_SA_FAMILY_T
-typedef unsigned short int sa_family_t;
-#endif
-
 #endif /* _INCLUDES_H */

Modified: branches/SAMBA_3_2/source/lib/replace/system/network.h
===================================================================
--- branches/SAMBA_3_2/source/lib/replace/system/network.h	2007-10-02 19:50:53 UTC (rev 25473)
+++ branches/SAMBA_3_2/source/lib/replace/system/network.h	2007-10-02 20:04:14 UTC (rev 25474)
@@ -118,4 +118,8 @@
 #define INET6_ADDRSTRLEN 46
 #endif
 
+#ifndef HAVE_SA_FAMILY_T
+typedef unsigned short int sa_family_t;
 #endif
+
+#endif

Modified: branches/SAMBA_3_2_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/includes.h	2007-10-02 19:50:53 UTC (rev 25473)
+++ branches/SAMBA_3_2_0/source/include/includes.h	2007-10-02 20:04:14 UTC (rev 25474)
@@ -1265,8 +1265,4 @@
 #include "libnscd.h"
 #endif
 
-#ifndef HAVE_SA_FAMILY_T
-typedef unsigned short int sa_family_t;
-#endif
-
 #endif /* _INCLUDES_H */

Modified: branches/SAMBA_3_2_0/source/lib/replace/system/network.h
===================================================================
--- branches/SAMBA_3_2_0/source/lib/replace/system/network.h	2007-10-02 19:50:53 UTC (rev 25473)
+++ branches/SAMBA_3_2_0/source/lib/replace/system/network.h	2007-10-02 20:04:14 UTC (rev 25474)
@@ -118,4 +118,8 @@
 #define INET6_ADDRSTRLEN 46
 #endif
 
+#ifndef HAVE_SA_FAMILY_T
+typedef unsigned short int sa_family_t;
 #endif
+
+#endif