build: more cygwin cleanups

diff --git a/configure.ac b/configure.ac
index e2777a72fb549fe8de1149ed079eb336c9ebabe1..1661b88866c2ca8ed3dccbea56c39c1ada684d26 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ AC_INIT(configure.ac)
     AC_CHECK_HEADERS([limits.h netdb.h netinet/in.h poll.h sched.h signal.h])
     AC_CHECK_HEADERS([stdarg.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h])
     AC_CHECK_HEADERS([syslog.h sys/prctl.h sys/socket.h sys/stat.h sys/syscall.h])
-    AC_CHECK_HEADERS([sys/time.h time.h unistd.h windows.h winsock2.h ws2tcpip.h])
+    AC_CHECK_HEADERS([sys/time.h time.h unistd.h])
     AC_CHECK_HEADERS([sys/ioctl.h linux/if_ether.h linux/if_packet.h linux/filter.h])
 
     AC_CHECK_HEADERS([sys/socket.h net/if.h sys/mman.h linux/if_arp.h], [], [],
@@ -109,6 +109,13 @@ AC_INIT(configure.ac)
         #endif
     ]])
 
+    AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h], [], [],
+                    [[#define _X86_
+                     ]])
+    AC_CHECK_HEADERS([w32api/winbase.h], [], [],
+                    [[#define _X86_
+                     #include <windows.h>
+                     ]])
 
     # Checks for typedefs, structures, and compiler characteristics.
     AC_C_INLINE

diff --git a/src/suricata-common.h b/src/suricata-common.h
index 418f960fdf8193f7dd915e17b4782b03b0a46c71..b36c489062c5fcac7ce840e0f1eb1170ea6c4f59 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -171,6 +171,12 @@
 #include <pcap/bpf.h>
 #endif
 
+#if __CYGWIN__
+#if !defined _X86_ && !defined __x86_64
+#define _X86_
+#endif
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
@@ -178,13 +184,18 @@
 #include <windows.h>
 #endif
 
+#ifdef HAVE_W32API_WINBASE_H
+#include <w32api/winbase.h>
+#endif
+
+#if !__CYGWIN__
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
-
 #ifdef HAVE_WS2TCPIP_H
 #include <ws2tcpip.h>
 #endif
+#endif /* !__CYGWIN__ */
 
 #ifdef HAVE_ASSERT_H
 #include <assert.h>