You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2012/03/06 13:33:58 UTC
svn commit: r1297445 - in /tomcat/jk/trunk/native: common/jk_global.h
iis/Makefile.amd64
Author: mturk
Date: Tue Mar 6 12:33:58 2012
New Revision: 1297445
URL: http://svn.apache.org/viewvc?rev=1297445&view=rev
Log:
Use _stat for newest MSVC's and axe bufferoverflow library. If needed user can provide it inside EXTRA_LIBS
Modified:
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/iis/Makefile.amd64
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1297445&r1=1297444&r2=1297445&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Tue Mar 6 12:33:58 2012
@@ -392,6 +392,10 @@ typedef int jk_sock_t;
#endif
#endif
+#if defined(_MSC_VER) && (_MSC_VER > 1200)
+#define stat _stat
+#endif
+
#ifdef AS400_UTF8
#define strcasecmp(a,b) apr_strnatcasecmp(a,b)
#endif
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1297445&r1=1297444&r2=1297445&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Tue Mar 6 12:33:58 2012
@@ -83,7 +83,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib $(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:AMD64 /def:".\isapi.def" /out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib $(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:AMD64 /def:".\isapi.def" /out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
DEF_FILE= \
".\isapi.def"
LINK32_OBJS= \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org