From 11ab3f8918eabb364060714e609ebd8fc2f3b336 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 1 Aug 2015 22:50:42 +0100 Subject: win32: Fix compilation warnings from commit 40c921f8b8 connect.c:953:5: warning: initializer element is not computable at load time connect.c:953:5: warning: missing initializer for field 'dwMinorVersion' of 'OSVERSIONINFOEX' curl_sspi.c:97:5: warning: initializer element is not computable at load time curl_sspi.c:97:5: warning: missing initializer for field 'szCSDVersion' of 'OSVERSIONINFOEX' --- lib/connect.c | 6 +++++- lib/curl_sspi.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/connect.c b/lib/connect.c index 5cb89280c..18ac32c32 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -950,7 +950,11 @@ void Curl_sndbufset(curl_socket_t sockfd) } #else ULONGLONG cm; - OSVERSIONINFOEX osver = { sizeof osver, majorVersion, }; + OSVERSIONINFOEX osver; + + memset(&osver, 0, sizeof(osver)); + osver.dwOSVersionInfoSize = sizeof(osver); + osver.dwMajorVersion = majorVersion; cm = VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL); cm = VerSetConditionMask(cm, VER_MINORVERSION, VER_GREATER_EQUAL); diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index d54587bbb..d2c37670e 100644 --- a/lib/curl_sspi.c +++ b/lib/curl_sspi.c @@ -94,7 +94,12 @@ CURLcode Curl_sspi_global_init(void) securityDll = TRUE; #else ULONGLONG cm; - OSVERSIONINFOEX osver = { sizeof osver, majorVersion, 0, 0, platformId, }; + OSVERSIONINFOEX osver; + + memset(&osver, 0, sizeof(osver)); + osver.dwOSVersionInfoSize = sizeof(osver); + osver.dwMajorVersion = majorVersion; + osver.dwPlatformId = platformId; cm = VerSetConditionMask(0, VER_MAJORVERSION, VER_EQUAL); cm = VerSetConditionMask(cm, VER_MINORVERSION, VER_GREATER_EQUAL); -- cgit v1.2.3