[PHP4BETA] CVS update: php4

Date: Friday April 16, 1999 @ 4:12 Author: andi Update of /repository/php4 In directory php:/tmp/cvs-serv11811 Modified Files: main.c php4.dsp Log Message: - Make the memory leak message print PHP4. Index: php4/main.c diff -u php4/main.c:1.14 php4/main.c:1.15 --- php4/main.c:1.14 Sat Apr 10 17:39:23 1999 +++ php4/main.c Fri Apr 16 04:12:51 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.14 1999/04/10 21:39:23 zeev Exp $ */ +/* $Id: main.c,v 1.15 1999/04/16 08:12:51 andi Exp $ */ /* #define CRASH_DETECTION */ @@ -612,7 +612,7 @@ # 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 Index: php4/php4.dsp diff -u php4/php4.dsp:1.3 php4/php4.dsp:1.4 --- php4/php4.dsp:1.3 Fri Apr 9 15:09:29 1999 +++ php4/php4.dsp Fri Apr 16 04:12:51 1999 @@ -42,7 +42,8 @@ # 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 @@ # 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 @@ # 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 -- PHP 4 Beta