git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3da1690
)
r18958: merge from samba4:
author
Stefan Metzmacher
<metze@samba.org>
Wed, 27 Sep 2006 14:18:08 +0000
(14:18 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 17:14:50 +0000
(12:14 -0500)
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
(This used to be commit
d8275347606cd183caea69837fd765b96d4bab71
)
source3/lib/replace/system/network.h
patch
|
blob
|
history
diff --git
a/source3/lib/replace/system/network.h
b/source3/lib/replace/system/network.h
index a21f8e2eaf43a51e5067d9a9631bd0bcf3f4148e..5e648dcd156c78a268e5292d052bc3104ce16db5 100644
(file)
--- a/
source3/lib/replace/system/network.h
+++ b/
source3/lib/replace/system/network.h
@@
-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