r6752: Patch by Steven Edwards to improve portability to mingw32

(This used to be commit 8d63cd33a223cccb21d808747e9c97da53629fbc)

6 files changed, 25 insertions, 4 deletions

diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index dc62c7bc12..0da7316f5a 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -60,16 +60,16 @@ AC_CHECK_HEADERS(compat.h)
 AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/mode.h)
 AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h sys/socket.h)
 AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
-AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
+AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
 AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h dlfcn.h)
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
 AC_CHECK_HEADERS(stdint.h locale.h)
-AC_CHECK_HEADERS(shadow.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
+AC_CHECK_HEADERS(shadow.h netdb.h netinet/in.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
 AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h security/pam_appl.h security/pam_modules.h)
 AC_CHECK_HEADERS(stropts.h)
 AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h)
 AC_CHECK_HEADERS(sys/acl.h)
-
+AC_CHECK_HEADERS(windows.h winsock2.h ws2tcpip.h)
 
 AC_TYPE_SIGNAL
 AC_TYPE_UID_T
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 65cbd1b777..a72a961495 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 676030b799..9de3168032 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 b1da60e69e..3d833780ec 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 8a5402131a..f994df542f 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
diff --git a/source4/nsswitch/winbind_nss_config.h b/source4/nsswitch/winbind_nss_config.h
index 06dda984ee..4edff061f8 100644
--- a/source4/nsswitch/winbind_nss_config.h
+++ b/source4/nsswitch/winbind_nss_config.h
@@ -75,7 +75,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
+
+#ifdef HAVE_PWD_H
 #include <pwd.h>
+#endif
 #include "nsswitch/winbind_nss.h"
 
 /* I'm trying really hard not to include anything from smb.h with the