[25780] in CVS-changelog-for-Kerberos-V5
svn rev #25270: trunk/src/ ccapi/lib/win/ config/
daemon@ATHENA.MIT.EDU (hartmans@mit.edu)
Wed Sep 28 16:56:38 2011
Date: Wed, 28 Sep 2011 16:56:36 -0400
From: hartmans@mit.edu
Message-Id: <201109282056.p8SKuaHq018271@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@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@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@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@12
+ENTRYPOINT=_DllMainCRTStartup@12
!endif
CCLINKOPTION=
SCLIB=
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
