You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mt...@apache.org on 2006/10/15 09:03:16 UTC
svn commit: r464141 - in /httpd/httpd/trunk/srclib/pcre: dftables.c
dftables.dsp
Author: mturk
Date: Sun Oct 15 00:03:14 2006
New Revision: 464141
URL: http://svn.apache.org/viewvc?view=rev&rev=464141
Log:
Revert 463929
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=464141&r1=464140&r2=464141
==============================================================================
--- httpd/httpd/trunk/srclib/pcre/dftables.c (original)
+++ httpd/httpd/trunk/srclib/pcre/dftables.c Sun Oct 15 00:03:14 2006
@@ -46,11 +46,6 @@
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=464141&r1=464140&r2=464141
==============================================================================
--- httpd/httpd/trunk/srclib/pcre/dftables.dsp (original)
+++ httpd/httpd/trunk/srclib/pcre/dftables.dsp Sun Oct 15 00:03:14 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 /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 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 /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 BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
Re: svn commit: r464141 - in /httpd/httpd/trunk/srclib/pcre: dftables.c
dftables.dsp
Posted by Mladen Turk <mt...@apache.org>.
William A. Rowe, Jr. wrote:
> Mladen Turk wrote:
>> William A. Rowe, Jr. wrote:
>>> why not s#/wd:4996#/D "_CRT_SECURE_NO_DEPRECATE"#
>>>
>> /wd with colon like (/wd:4966) gives:
>> Command line error D8021 : invalid numeric argument '/wd:4996' cl
>> when converted to VS2005.
>> BTW according to the MSDN the proper format is /wdNNNN not /wd:NNNN
>
> Yes - I understood that from your first commit message, thank you for this
> catch!
>
>> Also the _CRT_SECURE_NO_DEPRECATE is not required.
>
> Since you proposed that define as the alternative to /wd4996, I was curious
> why you preferred to disable the warning over defining out the warning?
> That's all - either way thank you for the fix.
>
It was a simple copy/paste from apr.hw,
so that's why _CRT_SECURE_NO_DEPRECATE get into focus :)
VS2005 compiles the converted dftables.vcproj without warnings.
Regards,
Mladen.
Re: svn commit: r464141 - in /httpd/httpd/trunk/srclib/pcre: dftables.c
dftables.dsp
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Mladen Turk wrote:
> William A. Rowe, Jr. wrote:
>>
>> why not s#/wd:4996#/D "_CRT_SECURE_NO_DEPRECATE"#
>>
>
> /wd with colon like (/wd:4966) gives:
> Command line error D8021 : invalid numeric argument '/wd:4996' cl
> when converted to VS2005.
> BTW according to the MSDN the proper format is /wdNNNN not /wd:NNNN
Yes - I understood that from your first commit message, thank you for this
catch!
> Also the _CRT_SECURE_NO_DEPRECATE is not required.
Since you proposed that define as the alternative to /wd4996, I was curious
why you preferred to disable the warning over defining out the warning?
That's all - either way thank you for the fix.
Re: svn commit: r464141 - in /httpd/httpd/trunk/srclib/pcre: dftables.c
dftables.dsp
Posted by Mladen Turk <mt...@apache.org>.
William A. Rowe, Jr. wrote:
>
> why not s#/wd:4996#/D "_CRT_SECURE_NO_DEPRECATE"#
>
/wd with colon like (/wd:4966) gives:
Command line error D8021 : invalid numeric argument '/wd:4996' cl
when converted to VS2005.
BTW according to the MSDN the proper format is /wdNNNN not /wd:NNNN
Also the _CRT_SECURE_NO_DEPRECATE is not required.
Regards,
Mladen.
Re: svn commit: r464141 - in /httpd/httpd/trunk/srclib/pcre: dftables.c
dftables.dsp
Posted by Mladen Turk <mt...@apache.org>.
William A. Rowe, Jr. wrote:
>
> why not s#/wd:4996#/D "_CRT_SECURE_NO_DEPRECATE"#
>
/wd with colon like (/wd:4966) gives:
Command line error D8021 : invalid numeric argument '/wd:4996' cl
when converted to VS2005.
BTW according to the MSDN the proper format is /wdNNNN not /wd:NNNN
Also the _CRT_SECURE_NO_DEPRECATE is not required.
Regards,
Mladen.
Re: svn commit: r464141 - in /httpd/httpd/trunk/srclib/pcre: dftables.c
dftables.dsp
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
> -# ADD 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 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 /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
why not s#/wd:4996#/D "_CRT_SECURE_NO_DEPRECATE"#
in the .dsp, provided it solves all of the emits?
Re: svn commit: r464141 - in /httpd/httpd/trunk/srclib/pcre: dftables.c
dftables.dsp
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
> -# ADD 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 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 /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
why not s#/wd:4996#/D "_CRT_SECURE_NO_DEPRECATE"#
in the .dsp, provided it solves all of the emits?