Mercurial > vim
diff src/os_win32.c @ 18973:bf8eb950df61 v8.2.0047
patch 8.2.0047: cannot skip tests for specific MS-Windows platform
Commit: https://github.com/vim/vim/commit/0c1e3744ff0cd6c17af773046b876b428ff3dded
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Dec 27 13:49:24 2019 +0100
patch 8.2.0047: cannot skip tests for specific MS-Windows platform
Problem: Cannot skip tests for specific MS-Windows platform.
Solution: Add windowsversion().
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 27 Dec 2019 14:00:04 +0100 |
| parents | 44906eff69f9 |
| children | 2ef19eed524a |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -758,8 +758,6 @@ null_libintl_wputenv(const wchar_t *envs # define VER_PLATFORM_WIN32_WINDOWS 1 #endif -DWORD g_PlatformId; - #ifdef HAVE_ACL # ifndef PROTO # include <aclapi.h> @@ -806,8 +804,7 @@ win32_enable_privilege(LPTSTR lpszPrivil #endif /* - * Set g_PlatformId to VER_PLATFORM_WIN32_NT (NT) or - * VER_PLATFORM_WIN32_WINDOWS (Win95). + * Set "win8_or_later" and fill in "windowsVersion". */ void PlatformId(void) @@ -821,7 +818,8 @@ PlatformId(void) ovi.dwOSVersionInfoSize = sizeof(ovi); GetVersionEx(&ovi); - g_PlatformId = ovi.dwPlatformId; + vim_snprintf(windowsVersion, sizeof(windowsVersion), "%d.%d", + (int)ovi.dwMajorVersion, (int)ovi.dwMinorVersion); if ((ovi.dwMajorVersion == 6 && ovi.dwMinorVersion >= 2) || ovi.dwMajorVersion > 6)