diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
| commit | 40811e93f3fdf9342a9295369994012420fac548 (patch) | |
| tree | a8d85e094a9c21e10aa250f537c101fc2016a049 /contrib/libs/curl/lib/version_win32.c | |
| parent | 30ebe5357bb143648c6be4d151ecd4944af81ada (diff) | |
| parent | 28a0c4a9f297064538a018c512cd9bbd00a1a35d (diff) | |
| download | ydb-40811e93f3fdf9342a9295369994012420fac548.tar.gz | |
Merge branch 'rightlib' into mergelibs-241016-1210
Diffstat (limited to 'contrib/libs/curl/lib/version_win32.c')
| -rw-r--r-- | contrib/libs/curl/lib/version_win32.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/contrib/libs/curl/lib/version_win32.c b/contrib/libs/curl/lib/version_win32.c index 25ec827462..e0f239e15d 100644 --- a/contrib/libs/curl/lib/version_win32.c +++ b/contrib/libs/curl/lib/version_win32.c @@ -30,10 +30,8 @@ #include "version_win32.h" #include "warnless.h" -/* The last 2 #include files should be in this order */ -#ifdef BUILDING_LIBCURL +/* The last #include files should be: */ #include "curl_memory.h" -#endif #include "memdebug.h" /* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW) @@ -55,7 +53,7 @@ struct OUR_OSVERSIONINFOEXW { /* * curlx_verify_windows_version() * - * This is used to verify if we are running on a specific Windows version. + * This is used to verify if we are running on a specific windows version. * * Parameters: * @@ -65,7 +63,7 @@ struct OUR_OSVERSIONINFOEXW { * ignored. * platform [in] - The optional platform identifier. * condition [in] - The test condition used to specifier whether we are - * checking a version less than, equal to or greater than + * checking a version less then, equal to or greater than * what is specified in the major and minor version * numbers. * @@ -80,13 +78,13 @@ bool curlx_verify_windows_version(const unsigned int majorVersion, bool matched = FALSE; #if defined(CURL_WINDOWS_APP) + (void)buildVersion; + /* We have no way to determine the Windows version from Windows apps, - so let's assume we are running on the target Windows version. */ + so let's assume we're running on the target Windows version. */ const WORD fullVersion = MAKEWORD(minorVersion, majorVersion); const WORD targetVersion = (WORD)_WIN32_WINNT; - (void)buildVersion; - switch(condition) { case VERSION_LESS_THAN: matched = targetVersion < fullVersion; @@ -110,7 +108,7 @@ bool curlx_verify_windows_version(const unsigned int majorVersion, } if(matched && (platform == PLATFORM_WINDOWS)) { - /* we are always running on PLATFORM_WINNT */ + /* we're always running on PLATFORM_WINNT */ matched = FALSE; } #elif !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_WIN2K) || \ |