svn commit: samba r18958 - in branches/SAMBA_3_0/source/lib/replace/system: .

[metze at samba.org]

Author: metze
Date: 2006-09-27 14:18:08 +0000 (Wed, 27 Sep 2006)
New Revision: 18958

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

Log:
merge from samba4:

we need to include unistd.h in system/network.h because
it contains the ioctl() prototype on some systems
and we need to make sure it gets included before socket_wrapper
defines ioctl swrap_ioctl

metze

Modified:
   branches/SAMBA_3_0/source/lib/replace/system/network.h


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/system/network.h
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/system/network.h	2006-09-27 14:16:32 UTC (rev 18957)
+++ branches/SAMBA_3_0/source/lib/replace/system/network.h	2006-09-27 14:18:08 UTC (rev 18958)
@@ -66,6 +66,10 @@
 #include <net/if.h>
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif