From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 17 Jan 2014 22:36:21 +0000 (+0000)
Subject: win32: Added additional preprocessor check for Version Helper API
X-Git-Tag: curl-7_35_0~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e35ffda0b3133def6f40d498ffa2faf60fb72899;p=thirdparty%2Fcurl.git

win32: Added additional preprocessor check for Version Helper API

A follow up patch to commit d2671340a613 as _WIN32_WINNT_WIN2K and
_WIN32_WINNT_WIN2K may not be defined on all systems.
---

diff --git a/lib/connect.c b/lib/connect.c
index 0f7deb3cba..5a376c34aa 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -921,7 +921,8 @@ void Curl_sndbufset(curl_socket_t sockfd)
   static int detectOsState = DETECT_OS_NONE;
 
   if(detectOsState == DETECT_OS_NONE) {
-#if (_WIN32_WINNT < _WIN32_WINNT_WIN2K)
+#if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_WIN2K) || \
+    (_WIN32_WINNT < _WIN32_WINNT_WIN2K)
     OSVERSIONINFO osver;
 
     memset(&osver, 0, sizeof(osver));
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index 1cc18877f9..bb41a879c7 100644
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -79,7 +79,8 @@ CURLcode Curl_sspi_global_init(void)
     DWORD majorVersion = 4;
     DWORD platformId = VER_PLATFORM_WIN32_NT;
 
-#if (_WIN32_WINNT < _WIN32_WINNT_WIN2K)
+#if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_WIN2K) || \
+    (_WIN32_WINNT < _WIN32_WINNT_WIN2K)
     OSVERSIONINFO osver;
 
     memset(&osver, 0, sizeof(osver));