From: Haris Okanovic <haris.okanovic@ni.com>
Date: Thu, 14 Aug 2014 19:35:12 +0000 (-0500)
Subject: win32: Fixed WinSock 2 #if
X-Git-Tag: curl-7_38_0~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da23624b57d2d03549c05610f5e9f4372032bfdc;p=thirdparty%2Fcurl.git

win32: Fixed WinSock 2 #if

A conditionally compiled block in connect.c references WinSock 2
symbols, but used `#ifdef HAVE_WINSOCK_H` instead of `#ifdef
HAVE_WINSOCK2_H`.

Bug: http://curl.haxx.se/mail/lib-2014-08/0155.html
---

diff --git a/lib/connect.c b/lib/connect.c
index 826ec251d9..6a79e64de7 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -94,7 +94,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *error);
 #define KEEPALIVE_FACTOR(x)
 #endif
 
-#if defined(HAVE_WINSOCK_H) && !defined(SIO_KEEPALIVE_VALS)
+#if defined(HAVE_WINSOCK2_H) && !defined(SIO_KEEPALIVE_VALS)
 #define SIO_KEEPALIVE_VALS    _WSAIOW(IOC_VENDOR,4)
 
 struct tcp_keepalive {