Commit 11ab3f89 authored by Steve Holme's avatar Steve Holme
Browse files

win32: Fix compilation warnings from commit 40c921f8 

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'
parent a1b2a6bd

lib/connect.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -950,7 +950,11 @@ void Curl_sndbufset(curl_socket_t sockfd) 
    }

    }

#else

#else

    ULONGLONG cm;

    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(0, VER_MAJORVERSION, VER_GREATER_EQUAL);

    cm = VerSetConditionMask(cm, VER_MINORVERSION, VER_GREATER_EQUAL);

    cm = VerSetConditionMask(cm, VER_MINORVERSION, VER_GREATER_EQUAL);

lib/curl_sspi.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,12 @@ CURLcode Curl_sspi_global_init(void) 
      securityDll = TRUE;

      securityDll = TRUE;

#else

#else

    ULONGLONG cm;

    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(0, VER_MAJORVERSION, VER_EQUAL);

    cm = VerSetConditionMask(cm, VER_MINORVERSION, VER_GREATER_EQUAL);

    cm = VerSetConditionMask(cm, VER_MINORVERSION, VER_GREATER_EQUAL);