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

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25270
Commit By: hartmans
Log Message:
Windows fix: correct ENTRYPOINT for 32 bit build.

Also remove already-commented-out obsolete bufferoverflowu.lib

Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>


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-28 20:56:30 UTC (rev 25269)
+++ trunk/src/ccapi/lib/win/Makefile.in	2011-09-28 20:56:36 UTC (rev 25270)
@@ -91,7 +91,7 @@
 
 # Main program:
 $(OUTPRE)$(CCLIB).dll: $(OBJS) $(CCLIB).def
-	$(LINK) $(LFLAGS) -entry:_DllMainCRTStartup at 12 -dll /map:$*.map /out:$@ /DEF:$(CCLIB).def $(OBJS) \
+	$(LINK) $(LFLAGS) -entry:$(ENTRYPOINT) -dll /map:$*.map /out:$@ /DEF:$(CCLIB).def $(OBJS) \
 	    /implib:$(CCLIB).lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags)
 
 $(CCLIB).def:

Modified: trunk/src/config/win-pre.in
===================================================================
--- trunk/src/config/win-pre.in	2011-09-28 20:56:30 UTC (rev 25269)
+++ trunk/src/config/win-pre.in	2011-09-28 20:56:36 UTC (rev 25270)
@@ -134,11 +134,8 @@
 
 !if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
 ENTRYPOINT=_DllMainCRTStartup
-#CCLINKOPTION=/link bufferoverflowu.lib
-#SCLIB=bufferoverflowu.lib
-#DEBUGOPT=/Zi
 !else
-ENTRYPOINT=_DLLMainCRTStartup at 12
+ENTRYPOINT=_DllMainCRTStartup at 12
 !endif
 CCLINKOPTION=
 SCLIB=