diff options
| author | Sam Hartman <hartmans@mit.edu> | 2011-09-28 20:56:36 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2011-09-28 20:56:36 +0000 |
| commit | 1f0a33eba649194f1775210ca92a66df6a8b47c5 (patch) | |
| tree | ff4d33c45ac2405b7d537f6b6eb36c4a64b9fd32 | |
| parent | 543f77349c1cfc6fa16ad4304ee29d730a0926cd (diff) | |
| download | krb5-1f0a33eba649194f1775210ca92a66df6a8b47c5.tar.gz krb5-1f0a33eba649194f1775210ca92a66df6a8b47c5.tar.xz krb5-1f0a33eba649194f1775210ca92a66df6a8b47c5.zip | |
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
| -rw-r--r-- | src/ccapi/lib/win/Makefile.in | 2 | ||||
| -rw-r--r-- | src/config/win-pre.in | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 62229ba78f..695fd0e129 100644 --- 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 965942b06d..dc68573a8c 100644 --- 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= |