From e35ffda0b3133def6f40d498ffa2faf60fb72899 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 17 Jan 2014 22:36:21 +0000 Subject: 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. --- lib/connect.c | 3 ++- lib/curl_sspi.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/connect.c b/lib/connect.c index 0f7deb3cb..5a376c34a 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 1cc18877f..bb41a879c 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)); -- cgit v1.2.3