Author: markt
Date: Fri Nov 4 09:44:14 2016
New Revision: 1767996
URL: http://svn.apache.org/viewvc?rev=1767996&view=rev
Log:
Fix DBCP-346
Compile the Windows binaries with the /DYNAMICBASE and /NXCOMPAT switches.
Modified:
commons/proper/daemon/trunk/src/changes/changes.xml
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1767996&r1=1767995&r2=1767996&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Fri Nov 4 09:44:14 2016
@@ -45,6 +45,10 @@
<action issue="DAEMON-347" type="update" dev="ggregory" due-to="Ganesh
Raju">
Add AArch64 support to src/native/unix/support/apsupport.m4
</action>
+ <action issue="DAEMON-346" type="fix" dev="markt">
+ Compile the Windows binaries with the /DYNAMICBASE and /NXCOMPAT
+ switches.
+ </action>
</release>
</body>
</document>
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile?rev=1767996&r1=1767995&r2=1767996&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile Fri
Nov 4 09:44:14 2016
@@ -28,7 +28,7 @@ PREFIX = .\..\..\dist
SRCDIR = .\..\..
!ENDIF
-LFLAGS = $(LFLAGS) /version:1.0
+LFLAGS = $(LFLAGS) /version:1.0 /DYNAMICBASE /NXCOMPAT
LIBS = $(LIBS) user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib
shlwapi.lib netapi32.lib
INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\src $(JAVA_INCLUDES)
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile?rev=1767996&r1=1767995&r2=1767996&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile Fri
Nov 4 09:44:14 2016
@@ -32,7 +32,7 @@ SRCDIR = .\..\..
LFLAGS = $(LFLAGS) /stack:0x64000
!ENDIF
-LFLAGS = $(LFLAGS) /version:1.0
+LFLAGS = $(LFLAGS) /version:1.0 /DYNAMICBASE /NXCOMPAT
LIBS = $(LIBS) user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib
shlwapi.lib netapi32.lib
INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\src $(JAVA_INCLUDES)
