This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 7213f5f38b71ef8aac0b3673a18bae0053fa8f18
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 25 18:54:01 2019 +0100
Add flag to pick up intended version of function.
---
native/NMAKEmakefile.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index 69f7b32..ad752a9 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -174,7 +174,7 @@ _WIN32_IE = 0x0800
!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VISTA,
WIN7)
!ENDIF
-NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
-DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
+NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
-DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) -DPSAPI_VERSION=1
!IF !DEFINED(BUILD) || "$(BUILD)" == ""
BUILD=RELEASE
@@ -256,7 +256,7 @@ CXXFLAGS = $(EXTRA_CXXFLAGS)
!ENDIF
# Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib
+LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib psapi.lib
# Extra libs from command line or env
!IF DEFINED(EXTRA_LIBS)
LIBS = $(LIBS) $(EXTRA_LIBS)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
