diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-27 13:49:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-27 13:49:24 +0100 |
| commit | 0c1e3744ff0cd6c17af773046b876b428ff3dded (patch) | |
| tree | 9e438566d524c8d980b5bc853915d90425999369 /src/os_win32.c | |
| parent | 5666fcd0bd794dd46813824cce63a38bcae63794 (diff) | |
| download | vim-git-0c1e3744ff0cd6c17af773046b876b428ff3dded.tar.gz | |
patch 8.2.0047: cannot skip tests for specific MS-Windows platformv8.2.0047
Problem: Cannot skip tests for specific MS-Windows platform.
Solution: Add windowsversion().
Diffstat (limited to 'src/os_win32.c')
| -rw-r--r-- | src/os_win32.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index c5670afd3..844d7941d 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -758,8 +758,6 @@ null_libintl_wputenv(const wchar_t *envstring UNUSED) # 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 lpszPrivilege, BOOL bEnable) #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) |