- Make the memory leak message print PHP4.

diff --git a/main/main.c b/main/main.c
index c69dc14f7d2908a2685ce0f97e0a1d5564334942..576444478d1ff4ff1f65f5ad9682b704e824d1a9 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -612,7 +612,7 @@ static void php_message_handler_for_zend(long message, void *data)
 #      if APACHE  /* log into the errorlog, since at this time we can't send messages to the browser */
                                        char memory_leak_buf[512];
 
-                                       snprintf(memory_leak_buf,512,"Possible PHP3 memory leak detected (harmless):  %d bytes from %s:%d",t->size,t->filename,t->lineno);
+                                       snprintf(memory_leak_buf,512,"Possible PHP4 memory leak detected (harmless):  %d bytes from %s:%d",t->size,t->filename,t->lineno);
 #              if MODULE_MAGIC_NUMBER >= 19970831
                                        aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, GLOBAL(php3_rqst)->server, memory_leak_buf);
 #              else

diff --git a/php4.dsp b/php4.dsp
index 10a4fa8f88062478ee51366479577bc840183616..b4a25144fce0ed1ac9b08d45831d5a80f39c6d1b 100644 (file)
--- a/php4.dsp
+++ b/php4.dsp
@@ -42,7 +42,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\projects\php4\include" /I "c:\projects\zend\zendcore" /I "." /I "regex\\" /I "d:\src\bind\include" /I "c:\projects\sapi" /D "NDEBUG" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILE_LIBZEND" /Fr /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\projects\php4\include" /I "c:\projects\libzend" /I "." /I "regex\\" /I "d:\src\bind\include" /I "c:\projects\sapi" /D "NDEBUG" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILE_LIBZEND" /Fr /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 lib44bsd95.lib resolv.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /out:"cgi_release\php.exe" /libpath:"c:\Projects\php4\lib" /libpath:"\src\lib" /libpath:"d:\src\bind\lib" /libpath:"c:\projects\sapi\release" /libpath:"c:\projects\zend\zendcore\release"
+# ADD LINK32 lib44bsd95.lib resolv.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /out:"cgi_release\php.exe" /libpath:"c:\Projects\php4\lib" /libpath:"\src\lib" /libpath:"d:\src\bind\lib" /libpath:"c:\projects\sapi\release" /libpath:"c:\projects\libzend\release"
 
 !ELSEIF  "$(CFG)" == "php4 - Win32 Debug"
 
@@ -101,6 +102,15 @@ SOURCE=".\configuration-scanner.c"
 # Begin Source File
 
 SOURCE=.\functions\cyr_convert.c
+
+!IF  "$(CFG)" == "php4 - Win32 Release"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "php4 - Win32 Debug"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File