Guard #include <sys/types.h> with HAVE_SYS_TYPES_H.

svn path=/trunk/; revision=31053

8 files changed, 20 insertions, 1 deletions

diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 8791c14ec2..82b7fd097d 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -49,7 +49,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 3002563346..cc46f4dc74 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -75,7 +75,10 @@
 #include <gmodule.h>
 #include <glib.h>
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
 #include <sys/stat.h>
 #include <epan/emem.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index 1b92bb65f8..fc5fd29a48 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -50,8 +50,11 @@
 #include "packet-x509if.h"
 #include "packet-cms.h"
 
-#ifndef _WIN32  
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index fb8a577412..041f352202 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -32,7 +32,9 @@
 #include <string.h>
 #include <ctype.h>
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index e719191709..3745f800ab 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -98,7 +98,9 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index c49e585e38..be9103a66e 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -41,7 +41,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index 07ba4b1d40..088e91bcd2 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -47,7 +47,9 @@
 #include "config.h"
 #endif /* HAVEHCONFIG_H */
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <sys/stat.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/epan/emem.c b/epan/emem.c
index 3e9225f1bb..1364610c87 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -61,7 +61,9 @@
 /* Add guard pages at each end of our allocated memory */
 #if defined(HAVE_SYSCONF) && defined(HAVE_MMAP) && defined(HAVE_MPROTECT) && defined(HAVE_STDINT_H)
 #include <stdint.h>
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <sys/mman.h>
 #if defined(MAP_ANONYMOUS)
 #define ANON_PAGE_MODE	(MAP_ANONYMOUS|MAP_PRIVATE)