thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1354

Browse Source 
Problem:    MS-Windows: Mismatch between default compile options and what the
            code expects.
Solution:   Change the default WINVER from 0x0500 to 0x0501. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2016-02-19 19:43:49 +01:00
parent 922d25f99c
commit 223b723be0
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Make_cyg_ming.mak
View File

@@ -42,7 +42,7 @@ DIRECTX=no
FEATURES=HUGE FEATURES=HUGE
# Set to one of i386, i486, i586, i686 as the minimum target processor. # Set to one of i386, i486, i586, i686 as the minimum target processor.
# For amd64/x64 architecture set ARCH=x86-64 . # 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). # Set to yes to cross-compile from unix; no=native Windows (and Cygwin).
CROSS=no CROSS=no
# Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'.
@@ -58,9 +58,9 @@ DYNAMIC_IME=yes
POSTSCRIPT=no POSTSCRIPT=no
# Set to yes to enable OLE support. # Set to yes to enable OLE support.
OLE=no 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 ifndef WINVER
WINVER = 0x0500 WINVER = 0x0501
endif endif
# Set to yes to enable Cscope support. # Set to yes to enable Cscope support.
CSCOPE=yes CSCOPE=yes
@@ -483,14 +483,14 @@ endif
endif endif
ifdef PYTHON ifdef PYTHON
CFLAGS += -DFEAT_PYTHON CFLAGS += -DFEAT_PYTHON
ifeq (yes, $(DYNAMIC_PYTHON)) ifeq (yes, $(DYNAMIC_PYTHON))
CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\"
endif endif
endif endif
ifdef PYTHON3 ifdef PYTHON3
CFLAGS += -DFEAT_PYTHON3 CFLAGS += -DFEAT_PYTHON3
ifeq (yes, $(DYNAMIC_PYTHON3)) ifeq (yes, $(DYNAMIC_PYTHON3))
CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\" CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\"
endif endif

4
src/Make_mvc.mak
View File

@@ -113,7 +113,7 @@
# Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is # Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is
# i386) # i386)
# #
# Version Support: WINVER=[0x0400, 0x0500] (default is 0x0500) # Version Support: WINVER=[0x0501, 0x0600] (default is 0x0501)
# #
# Debug version: DEBUG=yes # Debug version: DEBUG=yes
# Mapfile: MAP=[no, yes or lines] (default is 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) ### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET)
!ifndef WINVER !ifndef WINVER
WINVER = 0x0500 WINVER = 0x0501
!endif !endif
# If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal # If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal

2
src/version.c
View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1354,
/**/ /**/
1353, 1353,
/**/ /**/