This is an automated email from the ASF dual-hosted git repository.
mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new 30aebfe Allow to have WINVER defined in hexadecimal version when
calling nmake
new f4aeb3e Merge pull request #26 from mturk/master
30aebfe is described below
commit 30aebfe5bdff25d51bf45cabcc88d78d009e7918
Author: Mladen Turk <[email protected]>
AuthorDate: Wed Mar 3 22:21:39 2021 +0100
Allow to have WINVER defined in hexadecimal version when calling nmake
---
src/changes/changes.xml | 4 ++++
src/native/windows/include/Makefile.inc | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 640b4c7..e04349f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -56,6 +56,10 @@
<action type="update" dev="ggregory" due-to="Dependabot">
Bump actions/cache from v2 to v2.1.4 #24.
</action>
+ <action type="update" dev="mturk">
+ Procrun. Minor improvement that allows to have WINVER nmake variable
+ directly defined at compile time as ABI version in hexadecimal format.
+ </action>
</release>
<release version="1.2.4" date="2021-01-21" description="Bug fix release">
<action issue="DAEMON-424" type="fix" dev="markt" due-to="Bernhard
Scholz">
diff --git a/src/native/windows/include/Makefile.inc
b/src/native/windows/include/Makefile.inc
index 17e813d..007dbce 100644
--- a/src/native/windows/include/Makefile.inc
+++ b/src/native/windows/include/Makefile.inc
@@ -155,7 +155,8 @@ _WIN32_IE = 0x0700
NMAKE_WINVER = 0x0601
_WIN32_IE = 0x0800
!ELSE
-!ERROR Must specify WINVER environment variable (WINXP, WIN2003, VISTA, WIN7)
+NMAKE_WINVER = $(WINVER)
+_WIN32_IE = 0x0800
!ENDIF
NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
-D_WIN32_IE=$(_WIN32_IE)
