Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 92155 invoked from network); 14 Oct 2006 12:52:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Oct 2006 12:52:07 -0000 Received: (qmail 6726 invoked by uid 500); 14 Oct 2006 12:52:00 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 6686 invoked by uid 500); 14 Oct 2006 12:51:59 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 6674 invoked by uid 500); 14 Oct 2006 12:51:59 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 6671 invoked by uid 99); 14 Oct 2006 12:51:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Oct 2006 05:51:59 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Oct 2006 05:51:58 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 962F61A981A; Sat, 14 Oct 2006 05:51:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r463923 - in /tomcat/connectors/trunk/jk/native/iis/pcre: dftables.c dftables.dsp Date: Sat, 14 Oct 2006 12:51:38 -0000 To: tomcat-dev@jakarta.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061014125138.962F61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Sat Oct 14 05:51:37 2006 New Revision: 463923 URL: http://svn.apache.org/viewvc?view=rev&rev=463923 Log: Make sure the 4996 is disabled only for VS2005+ Modified: tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp Modified: tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c?view=diff&rev=463923&r1=463922&r2=463923 ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c (original) +++ tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c Sat Oct 14 05:51:37 2006 @@ -46,6 +46,11 @@ a function visible to the outside world, we make use of its code from here in order to be consistent. */ +#if defined(_MSC_VER) && _MSC_VER >= 1400 +#define _CRT_SECURE_NO_DEPRECATE +#pragma warning(disable: 4996) +#endif + #include #include #include Modified: tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp?view=diff&rev=463923&r1=463922&r2=463923 ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp (original) +++ tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp Sat Oct 14 05:51:37 2006 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Release\dftables" /FD /c -# ADD CPP /nologo /MD /W3 /wd:4996 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Release\dftables" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Release\dftables" /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -68,7 +68,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c -# ADD CPP /nologo /MDd /W3 /wd:4996 /EHsc /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org