svn rev #25207: trunk/src/ ccapi/lib/win/ config/

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25207
Commit By: hartmans
Log Message:
Fix x64 compile issues: remove bufferoverflowu.lib; this is obsolete
as of VS2005SP1. Use undecorated _DllMainCRTStartup as entry point
instead of _DllMainCRTStartup at 12

Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
Signed-off-by: Sam Hartman <hartmans at debian.org>


Changed Files:
U   trunk/src/ccapi/lib/win/Makefile.in
U   trunk/src/config/win-pre.in
Modified: trunk/src/ccapi/lib/win/Makefile.in
===================================================================
--- trunk/src/ccapi/lib/win/Makefile.in	2011-09-19 00:59:24 UTC (rev 25206)
+++ trunk/src/ccapi/lib/win/Makefile.in	2011-09-19 00:59:29 UTC (rev 25207)
@@ -91,7 +91,7 @@
 
 # Main program:
 $(OUTPRE)ccapi.dll: $(OBJS) ccapi.def
-	$(LINK) $(LFLAGS) -entry:_DllMainCRTStartup at 12 -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \
+	$(LINK) $(LFLAGS) -entry:$(ENTRYPOINT) -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \
 	    /implib:ccapi.lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags)
 
 ccapi.def:

Modified: trunk/src/config/win-pre.in
===================================================================
--- trunk/src/config/win-pre.in	2011-09-19 00:59:24 UTC (rev 25206)
+++ trunk/src/config/win-pre.in	2011-09-19 00:59:29 UTC (rev 25207)
@@ -135,14 +135,16 @@
 LOPTS=-nologo -incremental:no
 
 !if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
-CCLINKOPTION=/link bufferoverflowu.lib
-SCLIB=bufferoverflowu.lib
-DEBUGOPT=/Zi
+ENTRYPOINT=_DllMainCRTStartup
+#CCLINKOPTION=/link bufferoverflowu.lib
+#SCLIB=bufferoverflowu.lib
+#DEBUGOPT=/Zi
 !else
+ENTRYPOINT=_DLLMainCRTStartup at 12
+!endif
 CCLINKOPTION=
 SCLIB=
 DEBUGOPT=/Zi
-!endif
 
 #if the compiler is vstudio 8, generate manifest
 !if exists("$(VCINSTALLDIR)\..\..\MICROSOFT VISUAL STUDIO 8")