diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-27 14:18:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:14:50 -0500 |
| commit | 6aed2cd44e33cb10f52a41acd06c99d8b23df501 (patch) | |
| tree | 2a83cb25464d900c8d3699cb2a32e5b85e917952 /source3 | |
| parent | 3da1690692bba615f5c08b4209b5b1578b8e5b3c (diff) | |
| download | samba-6aed2cd44e33cb10f52a41acd06c99d8b23df501.tar.gz samba-6aed2cd44e33cb10f52a41acd06c99d8b23df501.tar.bz2 samba-6aed2cd44e33cb10f52a41acd06c99d8b23df501.zip | |
r18958: 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
(This used to be commit d8275347606cd183caea69837fd765b96d4bab71)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/replace/system/network.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h index a21f8e2eaf..5e648dcd15 100644 --- 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 |