diff options
| author | Sam Hartman <hartmans@mit.edu> | 2011-09-19 00:59:29 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2011-09-19 00:59:29 +0000 |
| commit | 24258919dbe905342dd554d3746e107051b63b6c (patch) | |
| tree | fd1a744926cfc95dfdff627da02d5dcd264854f3 /src | |
| parent | 5e78fcbfbee48aa95d5423b37599e2dfe16ca7d2 (diff) | |
| download | krb5-24258919dbe905342dd554d3746e107051b63b6c.tar.gz krb5-24258919dbe905342dd554d3746e107051b63b6c.tar.xz krb5-24258919dbe905342dd554d3746e107051b63b6c.zip | |
Fix x64 compile issues: remove bufferoverflowu.lib; this is obsolete
as of VS2005SP1. Use undecorated _DllMainCRTStartup as entry point
instead of _DllMainCRTStartup@12
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Signed-off-by: Sam Hartman <hartmans@debian.org>
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25207 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ccapi/lib/win/Makefile.in | 2 | ||||
| -rw-r--r-- | src/config/win-pre.in | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 7ca749a189..f97c92b0cb 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)ccapi.dll: $(OBJS) ccapi.def - $(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@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: diff --git a/src/config/win-pre.in b/src/config/win-pre.in index ff79095fd0..e211c13f3d 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -135,14 +135,16 @@ CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF) 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@12 +!endif CCLINKOPTION= SCLIB= DEBUGOPT=/Zi -!endif #if the compiler is vstudio 8, generate manifest !if exists("$(VCINSTALLDIR)\..\..\MICROSOFT VISUAL STUDIO 8") |