summaryrefslogtreecommitdiff
path: root/src/Make_mvc.mak
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-18 18:24:18 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-18 18:24:18 +0200
commitb6fb0516ec862a18fdffe06c9400d507a7193835 (patch)
tree4ff904f75596cb65758ee6a39dba61da97abea58 /src/Make_mvc.mak
parenta494f56f885876c98a276f7acfa386bfbb344680 (diff)
downloadvim-git-b6fb0516ec862a18fdffe06c9400d507a7193835.tar.gz
patch 8.2.0594: MS-Windows: cannot build with WINVER set to 0x0501v8.2.0594
Problem: MS-Windows: cannot build with WINVER set to 0x0501. Solution: Only use inet_ntop() when available. (Ozaki Kiichi, closes #5946)
Diffstat (limited to 'src/Make_mvc.mak')
-rw-r--r--src/Make_mvc.mak12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index e95a94ad5..ebc059f86 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -317,6 +317,10 @@ MSVCRT_NAME = vcruntime$(MSVCRT_VER)
CPU = ix86
!endif
+### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET)
+!ifndef WINVER
+WINVER = 0x0501
+!endif
# Flag to turn on Win64 compatibility warnings for VC7.x and VC8.
WP64CHECK = /Wp64
@@ -468,6 +472,9 @@ SOUND_LIB = winmm.lib
CHANNEL_PRO = proto/channel.pro
CHANNEL_OBJ = $(OBJDIR)/channel.obj
CHANNEL_DEFS = -DFEAT_JOB_CHANNEL -DFEAT_IPV6
+! if $(WINVER) >= 0x600
+CHANNEL_DEFS = $(CHANNEL_DEFS) -DHAVE_INET_NTOP
+! endif
NETBEANS_LIB = WSock32.lib Ws2_32.lib
!endif
@@ -493,11 +500,6 @@ CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
!endif
-### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET)
-!ifndef WINVER
-WINVER = 0x0501
-!endif
-
# If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal
# default, use these lines.
#VIMRCLOC = somewhere