Mercurial > vim

diff src/Make_mvc.mak @ 20077:128963cd954f v8.2.0594

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0594: MS-Windows: cannot build with WINVER set to 0x0501 Commit: https://github.com/vim/vim/commit/b6fb0516ec862a18fdffe06c9400d507a7193835 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Apr 18 18:24:18 2020 +0200 patch 8.2.0594: MS-Windows: cannot build with WINVER set to 0x0501 Problem: MS-Windows: cannot build with WINVER set to 0x0501. Solution: Only use inet_ntop() when available. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/5946)
author Bram Moolenaar <Bram@vim.org>
date Sat, 18 Apr 2020 18:30:03 +0200
parents 385e2f8aa8c1
children 6ca6a372fef6
line wrap: on
line diff
--- 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 adva
 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