diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-18 20:17:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-18 20:17:02 +0200 |
| commit | 1e1d2e89fa460328883bb09fb13a24e26ef1ab31 (patch) | |
| tree | 6bc273fc4788e4dafe9fd4b5f31981aa78437177 | |
| parent | c33b3216c8ceac84130d627b20cb7034e5f831e6 (diff) | |
| download | vim-git-8.2.0793.tar.gz | |
patch 8.2.0793: MS-Windows: cannot build GUI with small featuresv8.2.0793
Problem: MS-Windows: cannot build GUI with small features. (Michael Soyka)
Solution: Add #ifdef around use of windowsVersion. (Ken Takata)
| -rw-r--r-- | src/os_win32.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index edd5cdac4..89c7c5e3a 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -822,7 +822,7 @@ win32_enable_privilege(LPTSTR lpszPrivilege, BOOL bEnable) #endif /* - * Set "win8_or_later" and fill in "windowsVersion". + * Set "win8_or_later" and fill in "windowsVersion" if possible. */ void PlatformId(void) @@ -836,9 +836,10 @@ PlatformId(void) ovi.dwOSVersionInfoSize = sizeof(ovi); GetVersionEx(&ovi); +#ifdef FEAT_EVAL vim_snprintf(windowsVersion, sizeof(windowsVersion), "%d.%d", (int)ovi.dwMajorVersion, (int)ovi.dwMinorVersion); - +#endif if ((ovi.dwMajorVersion == 6 && ovi.dwMinorVersion >= 2) || ovi.dwMajorVersion > 6) win8_or_later = TRUE; diff --git a/src/version.c b/src/version.c index 14eca5f6a..055a4180e 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 793, +/**/ 792, /**/ 791, |