Skip to content

Commit 223b723

Browse files
committed
patch 7.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)
1 parent 922d25f commit 223b723

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/Make_cyg_ming.mak

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ DIRECTX=no
4242
FEATURES=HUGE
4343
# Set to one of i386, i486, i586, i686 as the minimum target processor.
4444
# For amd64/x64 architecture set ARCH=x86-64 .
45-
ARCH=i386
45+
ARCH=i686
4646
# Set to yes to cross-compile from unix; no=native Windows (and Cygwin).
4747
CROSS=no
4848
# Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'.
@@ -58,9 +58,9 @@ DYNAMIC_IME=yes
5858
POSTSCRIPT=no
5959
# Set to yes to enable OLE support.
6060
OLE=no
61-
# Set the default $(WINVER) to make it work with pre-Win2k.
61+
# Set the default $(WINVER) to make it work with WinXP.
6262
ifndef WINVER
63-
WINVER = 0x0500
63+
WINVER = 0x0501
6464
endif
6565
# Set to yes to enable Cscope support.
6666
CSCOPE=yes
@@ -483,14 +483,14 @@ endif
483483
endif
484484

485485
ifdef PYTHON
486-
CFLAGS += -DFEAT_PYTHON
486+
CFLAGS += -DFEAT_PYTHON
487487
ifeq (yes, $(DYNAMIC_PYTHON))
488488
CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\"
489489
endif
490490
endif
491491

492-
ifdef PYTHON3
493-
CFLAGS += -DFEAT_PYTHON3
492+
ifdef PYTHON3
493+
CFLAGS += -DFEAT_PYTHON3
494494
ifeq (yes, $(DYNAMIC_PYTHON3))
495495
CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\"
496496
endif

src/Make_mvc.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
# Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is
114114
# i386)
115115
#
116-
# Version Support: WINVER=[0x0400, 0x0500] (default is 0x0500)
116+
# Version Support: WINVER=[0x0501, 0x0600] (default is 0x0501)
117117
#
118118
# Debug version: DEBUG=yes
119119
# 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
371371

372372
### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET)
373373
!ifndef WINVER
374-
WINVER = 0x0500
374+
WINVER = 0x0501
375375
!endif
376376

377377
# If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1354,
750752
/**/
751753
1353,
752754
/**/

0 commit comments

Comments
 (0)