Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 5463 invoked from network); 14 Oct 2006 13:35:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Oct 2006 13:35:25 -0000 Received: (qmail 38545 invoked by uid 500); 14 Oct 2006 13:35:24 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 38504 invoked by uid 500); 14 Oct 2006 13:35:24 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 38493 invoked by uid 99); 14 Oct 2006 13:35:24 -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 06:35:24 -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 06:35:23 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2BA261A981A; Sat, 14 Oct 2006 06:35:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r463929 - in /httpd/httpd/trunk/srclib/pcre: dftables.c dftables.dsp Date: Sat, 14 Oct 2006 13:35:02 -0000 To: cvs@httpd.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061014133503.2BA261A981A@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 06:34:58 2006 New Revision: 463929 URL: http://svn.apache.org/viewvc?view=rev&rev=463929 Log: Fix compile warning. The /wd:XXXX is invalid. It should be /wdXXXX, and since its for VS2005 only use the standard preprocessor directives instead of that. This should be backported to 2.2 as well. Modified: httpd/httpd/trunk/srclib/pcre/dftables.c httpd/httpd/trunk/srclib/pcre/dftables.dsp Modified: httpd/httpd/trunk/srclib/pcre/dftables.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/srclib/pcre/dftables.c?view=diff&rev=463929&r1=463928&r2=463929 ============================================================================== --- httpd/httpd/trunk/srclib/pcre/dftables.c (original) +++ httpd/httpd/trunk/srclib/pcre/dftables.c Sat Oct 14 06:34:58 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: httpd/httpd/trunk/srclib/pcre/dftables.dsp URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/srclib/pcre/dftables.dsp?view=diff&rev=463929&r1=463928&r2=463929 ============================================================================== --- httpd/httpd/trunk/srclib/pcre/dftables.dsp (original) +++ httpd/httpd/trunk/srclib/pcre/dftables.dsp Sat Oct 14 06:34:58 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