diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-19 19:43:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-19 19:43:49 +0100 |
| commit | 223b723be0703137cf6373e23f8ae5c02e92ef82 (patch) | |
| tree | 16775eb3a2b6da7ba63be5677b93ec4fc9c1a605 | |
| parent | 922d25f99c6d38e7f9cfca7a53ab841641517ebc (diff) | |
| download | vim-git-223b723be0703137cf6373e23f8ae5c02e92ef82.tar.gz | |
patch 7.4.1354v7.4.1354
Problem: MS-Windows: Mismatch between default compile options and what the
code expects.
Solution: Change the default WINVER from 0x0500 to 0x0501. (Ken Takata)
| -rw-r--r-- | src/Make_cyg_ming.mak | 12 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 6a2b91f6c..8dc7d003c 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -42,7 +42,7 @@ DIRECTX=no FEATURES=HUGE # Set to one of i386, i486, i586, i686 as the minimum target processor. # For amd64/x64 architecture set ARCH=x86-64 . -ARCH=i386 +ARCH=i686 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin). CROSS=no # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. @@ -58,9 +58,9 @@ DYNAMIC_IME=yes POSTSCRIPT=no # Set to yes to enable OLE support. OLE=no -# Set the default $(WINVER) to make it work with pre-Win2k. +# Set the default $(WINVER) to make it work with WinXP. ifndef WINVER -WINVER = 0x0500 +WINVER = 0x0501 endif # Set to yes to enable Cscope support. CSCOPE=yes @@ -483,14 +483,14 @@ endif endif ifdef PYTHON -CFLAGS += -DFEAT_PYTHON +CFLAGS += -DFEAT_PYTHON ifeq (yes, $(DYNAMIC_PYTHON)) CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" endif endif -ifdef PYTHON3 -CFLAGS += -DFEAT_PYTHON3 +ifdef PYTHON3 +CFLAGS += -DFEAT_PYTHON3 ifeq (yes, $(DYNAMIC_PYTHON3)) CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\" endif diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 6cada6560..f1b17148c 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -113,7 +113,7 @@ # Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is # i386) # -# Version Support: WINVER=[0x0400, 0x0500] (default is 0x0500) +# Version Support: WINVER=[0x0501, 0x0600] (default is 0x0501) # # Debug version: DEBUG=yes # Mapfile: MAP=[no, yes or lines] (default is yes) @@ -371,7 +371,7 @@ CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib ### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET) !ifndef WINVER -WINVER = 0x0500 +WINVER = 0x0501 !endif # If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal diff --git a/src/version.c b/src/version.c index e3d7d1bbb..33824d103 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1354, +/**/ 1353, /**/ 1352, |