Please avoid polluting the sources of third party origin, it's junk like this that makes merging to more modern external sources a real PITA.
If you need a define, you add a define. We have a compiler options line in this same patch, no? [EMAIL PROTECTED] wrote: > 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 <ctype.h> > #include <stdio.h> > #include <string.h> > > 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 > > > >
