From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 9 Sep 2013 09:29:28 +0000 (-0600)
Subject: Windows: updated test for ws2tcpip.h and windows.h
X-Git-Tag: SQUID_3_3_10~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea94175e683bb13330e66965d49e3147486155af;p=thirdparty%2Fsquid.git

Windows: updated test for ws2tcpip.h and windows.h
---

diff --git a/configure.ac b/configure.ac
index 1746b1fb98..afad9e08a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1157,8 +1157,14 @@ if test "x${enable_eui:=yes}" = "xyes" ; then
   esac
   #Iphlpapi.h check delayed after winsock2.h
   AC_CHECK_HEADERS( \
+    windows.h \
     sys/sockio.h \
-    sys/param.h
+    sys/param.h,
+  [], [], [[
+#if HAVE_WINDOWS_H
+include <windows.h>
+#endif
+]]
   )
   AC_CHECK_HEADERS( \
     net/if_arp.h \
@@ -2652,7 +2658,13 @@ AC_SEARCH_LIBS([yp_match], [nsl nss_nis nss_nisplus])
 dnl Check for Winsock only on MinGW, on Cygwin we must use emulated BSD socket API
 if test "x$squid_host_os" = "xmingw" ; then
   SQUID_CHECK_WINSOCK_LIB
-  AC_CHECK_HEADERS(Iphlpapi.h,,,[
+  AC_CHECK_HEADERS( \
+    windows.h \
+    ws2tcpip.h \
+    Iphlpapi.h ,,,[
+#if HAVE_WINDOWS_H
+#include <windows.h>
+#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif])