Commit b0ef0189 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Survey says; /Oy- stack frame construction to help untangle crashes
  is goodness, /Gs0 stack checking override is a bad idea.  Adopt the
  accepted idea only.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@191525 13f79535-47bb-0310-9956-ffa450edef68
parent cb98fa7f

src/Apache.dsp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

# ADD CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fd"Release\Apache_src" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fd"Release\Apache_src" /FD /c

# ADD BASE RSC /l 0x809 /d "NDEBUG"

# ADD RSC /l 0x809 /d "NDEBUG"

BSC32=bscmake.exe

src/Apache.mak

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ CLEAN : 
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"



CPP=cl.exe

CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache_src" /FD /c 

CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache_src" /FD /c 



.c{$(INTDIR)}.obj::

   $(CPP) @<<

src/ApacheCore.dsp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Zi /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\ApacheCore_src" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\ApacheCore_src" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "NDEBUG"

src/ApacheCore.mak

+7 −5
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ OutDir=.\Release 


!IF "$(RECURSE)" == "0" 



ALL : "$(OUTDIR)\ApacheCore.dll"

ALL : ".\main\uri_delims.h" ".\main\test_char.h" "$(OUTDIR)\ApacheCore.dll"



!ELSE 



ALL : "Win9xConHook - Win32 Release" "regex - Win32 Release" "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release" "ApacheOS - Win32 Release" "ap - Win32 Release" "$(OUTDIR)\ApacheCore.dll"

ALL : "Win9xConHook - Win32 Release" "regex - Win32 Release" "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release" "ApacheOS - Win32 Release" "ap - Win32 Release" ".\main\uri_delims.h" ".\main\test_char.h" "$(OUTDIR)\ApacheCore.dll"



!ENDIF
@@ -94,12 +94,14 @@ CLEAN : 
	-@erase "$(OUTDIR)\ApacheCore.exp"

	-@erase "$(OUTDIR)\ApacheCore.lib"

	-@erase "$(OUTDIR)\ApacheCore.pdb"

	-@erase ".\main\test_char.h"

	-@erase ".\main\uri_delims.h"



"$(OUTDIR)" :

    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"



CPP=cl.exe

CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore_src" /FD /c 

CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore_src" /FD /c 



.c{$(INTDIR)}.obj::

   $(CPP) @<<
@@ -588,7 +590,7 @@ SOURCE=.\os\win32\service.c 


SOURCE=.\main\util.c



"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" ".\main\test_char.h"

"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -612,7 +614,7 @@ SOURCE=.\main\util_script.c 


SOURCE=.\main\util_uri.c



"$(INTDIR)\util_uri.obj" : $(SOURCE) "$(INTDIR)" ".\main\uri_delims.h"

"$(INTDIR)\util_uri.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)

src/ap/ap.dsp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ RSC=rc.exe 
# PROP Intermediate_Dir "LibR"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"LibR\ap" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"LibR\ap" /FD /c

# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

BSC32=bscmake.exe