CVS update: php3

Date: Sunday February 28, 1999 @ 18:00 Author: zeev Update of /repository/php3 In directory asf:/u/temp/cvs-serv13525 Modified Files: config.w32.h php.h php3.dsp php_custom_build.dsp Log Message: * Nuke compat.h off php.h - it's a load of problems under Win32 and rarely necessary * Rename compat.[ch] to php_compat.[ch] * Fix numerous Win32 compile/link problems Index: php3/config.w32.h diff -c php3/config.w32.h:1.76 php3/config.w32.h:1.77 *** php3/config.w32.h:1.76 Thu Feb 18 12:48:50 1999 --- php3/config.w32.h Sun Feb 28 18:00:41 1999 *************** *** 9,14 **** --- 9,16 ---- are availabe in the ntbind distribution */ #define HAVE_BINDLIB 1 + #define HAVE_INET_ATON HAVE_BINDLIB + /* set to enable bcmath */ #define WITH_BCMATH 1 /* should be added to runtime config*/ Index: php3/php.h diff -c php3/php.h:1.48 php3/php.h:1.49 *** php3/php.h:1.48 Sun Jan 31 09:51:27 1999 --- php3/php.h Sun Feb 28 18:00:41 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.48 1999/01/31 14:51:27 sas Exp $ */ #ifndef _PHP_H #define _PHP_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.49 1999/02/28 23:00:41 zeev Exp $ */ #ifndef _PHP_H #define _PHP_H *************** *** 145,151 **** # endif #endif ! #include "compat.h" #include "php3_hash.h" #include "alloc.h" --- 145,151 ---- # endif #endif ! //#include "compat.h" #include "php3_hash.h" #include "alloc.h" Index: php3/php3.dsp diff -c php3/php3.dsp:1.52 php3/php3.dsp:1.53 *** php3/php3.dsp:1.52 Thu Feb 18 12:48:50 1999 --- php3/php3.dsp Sun Feb 28 18:00:41 1999 *************** *** 62,73 **** # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "c:\php3" # PROP Intermediate_Dir "cgi_debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "regex\\" /I "d:\src\bind\include" /I "d:/src/wc5sdk/server/include/cpp" /D DEBUG=1 /D "_DEBUG" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" BSC32=bscmake.exe --- 62,73 ---- # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "c:\projects\php3\cgi_debug" # PROP Intermediate_Dir "cgi_debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "regex\\" /I "d:\src\bind\include" /I "d:/src/wc5sdk/server/include/cpp" /I "c:\projects\php3\include" /D DEBUG=1 /D "_DEBUG" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" BSC32=bscmake.exe *************** *** 75,81 **** # 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 /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 wcsrv.lib 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 /debug /machine:I386 /out:"c:\php3\php.exe" /pdbtype:sept /libpath:"\src\lib" /libpath:"d:\src\bind\lib" /libpath:"d:/src/wc5sdk/server/lib" !ENDIF --- 75,81 ---- # 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 /debug /machine:I386 /pdbtype:sept ! # 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 /debug /machine:I386 /out:"c:\projects\php3\cgi_debug\php.exe" /pdbtype:sept /libpath:"\src\lib" /libpath:"d:\src\bind\lib" /libpath:"d:/src/wc5sdk/server/lib" /libpath:"c:\projects\php3\lib" !ENDIF *************** *** 456,469 **** # End Source File # Begin Source File - SOURCE=.\compat.c - # End Source File - # Begin Source File - - SOURCE=.\compat.h - # End Source File - # Begin Source File - SOURCE=.\config.w32.h # End Source File # Begin Source File --- 456,461 ---- *************** *** 605,610 **** --- 597,610 ---- # Begin Source File SOURCE=.\php3_realpath.h + # End Source File + # Begin Source File + + SOURCE=.\php_compat.c + # End Source File + # Begin Source File + + SOURCE=.\php_compat.h # End Source File # Begin Source File Index: php3/php_custom_build.dsp diff -c php3/php_custom_build.dsp:1.4 php3/php_custom_build.dsp:1.5 *** php3/php_custom_build.dsp:1.4 Thu Nov 12 08:48:58 1998 --- php3/php_custom_build.dsp Sun Feb 28 18:00:41 1999 *************** *** 102,108 **** InputPath=".\configuration-parser.y" "configuration-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! bison.exe -p cfg -v -d configuration-parser.y # End Custom Build --- 102,108 ---- InputPath=".\configuration-parser.y" "configuration-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! bison -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y # End Custom Build *************** *** 157,165 **** # Begin Custom Build - Performing Custom Build Step on $(InputPath) InputPath=".\language-parser.y" "language-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! bison.exe -p php -v -d language-parser.y # End Custom Build !ENDIF --- 157,170 ---- # Begin Custom Build - Performing Custom Build Step on $(InputPath) InputPath=".\language-parser.y" + BuildCmds= \ + bison -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p php language-parser.y + "language-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) + "language-parser.tab.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) # End Custom Build !ENDIF -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net