From 15a8f0ff0ad6104505f5275a901cf0cf8eb8f9b9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 12 May 2005 10:46:57 +0000
Subject: r6752: Patch by Steven Edwards to improve portability to mingw32
 (This used to be commit 8d63cd33a223cccb21d808747e9c97da53629fbc)

---
 source4/include/system/glob.h    | 2 ++
 source4/include/system/network.h | 7 +++++++
 source4/include/system/passwd.h  | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'source4/include/system')

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
-- 
cgit