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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@463929 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/srclib/pcre/dftables.c b/srclib/pcre/dftables.c
index 8458c60f1c5251e409b36f91e554b0e736ab480a..470a5fc4175cfc66d41a93dcb5d33fd8f551f6a9 100644 (file)
--- a/srclib/pcre/dftables.c
+++ b/srclib/pcre/dftables.c
@@ -46,6 +46,11 @@ locale and used as the default tables by PCRE. Now that pcre_maketables is
 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 <ctype.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/srclib/pcre/dftables.dsp b/srclib/pcre/dftables.dsp
index 6c0735000630839326e2d757cfa49b74e7c6c0ee..8f5c89f1f1c36b81b925df03d5772df12adddcf8 100644 (file)
--- a/srclib/pcre/dftables.dsp
+++ b/srclib/pcre/dftables.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 @@ LINK32=link.exe
 # 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