------------------------------------------------------------
revno: 12260
revision-id: squid3@treenet.co.nz-20120808073935-zg0yhebhl40zgi79
parent: squid3@treenet.co.nz-20120808072113-hu0t5h5i29u1eqsl
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Wed 2012-08-08 01:39:35 -0600
message:
  Windows: fix winsock detection capabilities
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20120808073935-zg0yhebhl40zgi79
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 22a524a17c23004339314a10765d0c866ff77c55
# timestamp: 2012-08-08 07:51:42 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20120808072113-\
#   hu0t5h5i29u1eqsl
# 
# Begin patch
=== modified file 'acinclude/os-deps.m4'
--- acinclude/os-deps.m4	2012-07-09 02:35:45 +0000
+++ acinclude/os-deps.m4	2012-08-08 07:39:35 +0000
@@ -242,11 +242,10 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv) {
 	FILE *fp = fopen("conftestval", "w");
@@ -422,11 +421,10 @@
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -473,11 +471,10 @@
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -524,11 +521,10 @@
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -579,11 +575,10 @@
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -892,8 +887,7 @@
 #endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
-#endif
-#if HAVE_WINSOCK_H
+#elif HAVE_WINSOCK_H
 #include <winsock.h>
 #endif
 int main (int argc, char ** argv) {