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'

diff --git a/lib/connect.c b/lib/connect.c
index 5cb89280cc71aea00d95ba77b538fb9b602cf210..18ac32c324cae9c5c82e5ebc824416bba5b4bd64 100644 (file)
--- 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 d54587bbbfb4bdb2b6d598713a0464c6071df807..d2c37670ee1c01921c5fd80e50ab418136958786 100644 (file)
--- 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);