------------------------------------------------------------
revno: 12608
revision-id: squid3@treenet.co.nz-20130909092928-63ye90p9zwjvowpq
parent: squid3@treenet.co.nz-20130909071719-a40xq1x3ch4xral0
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Mon 2013-09-09 03:29:28 -0600
message:
  Windows: updated test for ws2tcpip.h and windows.h
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130909092928-63ye90p9zwjvowpq
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 2529efb8742f3318418e063c16b8904d9b4f2d8f
# timestamp: 2013-09-09 09:30:04 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130909071719-\
#   a40xq1x3ch4xral0
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2013-09-08 22:05:21 +0000
+++ configure.ac	2013-09-09 09:29:28 +0000
@@ -1157,8 +1157,14 @@
   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 @@
 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])