Windows fix: correct ENTRYPOINT for 32 bit build

Also remove already-commented-out obsolete bufferoverflowu.lib

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25270 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in
index 62229ba78f51a5d06a5cd2b5619b91176381ff9c..695fd0e12992657dc88ee535f00c349f5948202c 100644 (file)
--- a/src/ccapi/lib/win/Makefile.in
+++ b/src/ccapi/lib/win/Makefile.in
@@ -91,7 +91,7 @@ midl : ccs_request.h ccs_reply.h
 
 # Main program:
 $(OUTPRE)$(CCLIB).dll: $(OBJS) $(CCLIB).def
-       $(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@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:

diff --git a/src/config/win-pre.in b/src/config/win-pre.in
index 965942b06dd0055ddaeac992267b605eee52dd81..dc68573a8c0724114c70aece45ad14dc8ceeed1a 100644 (file)
--- a/src/config/win-pre.in
+++ b/src/config/win-pre.in
@@ -134,11 +134,8 @@ LOPTS=-nologo -incremental:no
 
 !if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
 ENTRYPOINT=_DllMainCRTStartup
-#CCLINKOPTION=/link bufferoverflowu.lib
-#SCLIB=bufferoverflowu.lib
-#DEBUGOPT=/Zi
 !else
-ENTRYPOINT=_DLLMainCRTStartup@12
+ENTRYPOINT=_DllMainCRTStartup@12
 !endif
 CCLINKOPTION=
 SCLIB=