diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-05-12 10:46:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:41 -0500 |
| commit | 15a8f0ff0ad6104505f5275a901cf0cf8eb8f9b9 (patch) | |
| tree | 9c41593a2124b1d6e17a0443384923ec590e3c23 /source4/include | |
| parent | 51a3cfe35eca4b4793811d70877ca243f810a31e (diff) | |
| download | samba-15a8f0ff0ad6104505f5275a901cf0cf8eb8f9b9.tar.gz samba-15a8f0ff0ad6104505f5275a901cf0cf8eb8f9b9.tar.xz samba-15a8f0ff0ad6104505f5275a901cf0cf8eb8f9b9.zip | |
r6752: Patch by Steven Edwards to improve portability to mingw32
(This used to be commit 8d63cd33a223cccb21d808747e9c97da53629fbc)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/includes.h | 8 | ||||
| -rw-r--r-- | source4/include/system/glob.h | 2 | ||||
| -rw-r--r-- | source4/include/system/network.h | 7 | ||||
| -rw-r--r-- | source4/include/system/passwd.h | 3 |
4 files changed, 19 insertions, 1 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index 65cbd1b7778..a72a9614951 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -70,6 +70,14 @@ #include <varargs.h> #endif +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> +#endif + +#ifdef HAVE_WINDOWS_H +#include <windows.h> +#endif + /* we support ADS if we want it and have krb5 and ldap libs */ #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS diff --git a/source4/include/system/glob.h b/source4/include/system/glob.h index 676030b7994..9de31680321 100644 --- a/source4/include/system/glob.h +++ b/source4/include/system/glob.h @@ -24,4 +24,6 @@ #include <glob.h> #endif +#ifdef HAVE_FNMATCH_H #include <fnmatch.h> +#endif diff --git a/source4/include/system/network.h b/source4/include/system/network.h index b1da60e69e0..3d833780ec1 100644 --- a/source4/include/system/network.h +++ b/source4/include/system/network.h @@ -28,9 +28,16 @@ #include <sys/un.h> #endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> +#endif + +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif #ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> diff --git a/source4/include/system/passwd.h b/source4/include/system/passwd.h index 8a5402131a9..f994df542fb 100644 --- a/source4/include/system/passwd.h +++ b/source4/include/system/passwd.h @@ -20,8 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef HAVE_PWD_H #include <pwd.h> - +#endif #ifdef HAVE_GRP_H #include <grp.h> #endif |