CVS update: php3

Date: Friday January 29, 1999 @ 16:42 Author: shane Update of /repository/php3 In directory asf:/u/temp/cvs-serv9532 Modified Files: debugger.c internal_functions.c internal_functions.h php.h php3.dsp php3.dsw Log Message: add inet_aton for systems that don't have it. Someone needs to do config stuff on unix for this. Index: php3/debugger.c diff -c php3/debugger.c:1.67 php3/debugger.c:1.68 *** php3/debugger.c:1.67 Fri Jan 22 17:00:52 1999 --- php3/debugger.c Fri Jan 29 16:42:13 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: debugger.c,v 1.67 1999/01/22 22:00:52 sas Exp $ */ #if THREAD_SAFE #include "tls.h" #endif --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: debugger.c,v 1.68 1999/01/29 21:42:13 shane Exp $ */ #if THREAD_SAFE #include "tls.h" #endif *************** *** 168,174 **** { char tmpname[33]; int err; ! memset(tmpname, 0, sizeof(tmpname)); err = gethostname(tmpname, sizeof(tmpname) - 1); if (err == -1) { --- 168,174 ---- { char tmpname[33]; int err; ! memset(tmpname, 0, sizeof(tmpname)); err = gethostname(tmpname, sizeof(tmpname) - 1); if (err == -1) { Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.342 php3/internal_functions.c:1.343 *** php3/internal_functions.c:1.342 Wed Jan 27 14:18:09 1999 --- php3/internal_functions.c Fri Jan 29 16:42:13 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.342 1999/01/27 19:18:09 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.343 1999/01/29 21:42:13 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 99,105 **** --- 99,107 ---- #include "functions/php3_dav.h" #include "functions/php3_gettext.h" #include "functions/php3_wddx.h" + #ifndef WIN32 #include <netinet/in.h> + #endif #include "functions/fsock.h" #include "functions/php3_mckcrypt.h" Index: php3/internal_functions.h diff -c php3/internal_functions.h:1.128 php3/internal_functions.h:1.129 *** php3/internal_functions.h:1.128 Fri Jan 1 12:58:49 1999 --- php3/internal_functions.h Fri Jan 29 16:42:14 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.h,v 1.128 1999/01/01 17:58:49 zeev Exp $ */ #ifndef _INTERNAL_FUNCTIONS_H --- 29,35 ---- */ ! /* $Id: internal_functions.h,v 1.129 1999/01/29 21:42:14 shane Exp $ */ #ifndef _INTERNAL_FUNCTIONS_H *************** *** 63,69 **** #define BYREF_FORCE 1 #define BYREF_ALLOW 2 ! #if !MSVC5 #define DLEXPORT #endif --- 63,69 ---- #define BYREF_FORCE 1 #define BYREF_ALLOW 2 ! #if !WIN32 #define DLEXPORT #endif Index: php3/php.h diff -c php3/php.h:1.45 php3/php.h:1.46 *** php3/php.h:1.45 Thu Jan 28 21:39:50 1999 --- php3/php.h Fri Jan 29 16:42:14 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.45 1999/01/29 02:39:50 rasmus Exp $ */ #ifndef _PHP_H #define _PHP_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.46 1999/01/29 21:42:14 shane Exp $ */ #ifndef _PHP_H #define _PHP_H *************** *** 52,58 **** #define inline #endif ! #if MSVC5 #include "config.w32.h" #include "win95nt.h" # if defined(COMPILE_DL) --- 52,58 ---- #define inline #endif ! #if WIN32 #include "config.w32.h" #include "win95nt.h" # if defined(COMPILE_DL) *************** *** 203,209 **** #endif #if HAVE_PWD_H ! # if MSVC5 #include "win32/pwd.h" #include "win32/param.h" # else --- 203,209 ---- #endif #if HAVE_PWD_H ! # if WIN32 #include "win32/pwd.h" #include "win32/param.h" # else Index: php3/php3.dsp diff -c php3/php3.dsp:1.49 php3/php3.dsp:1.50 *** php3/php3.dsp:1.49 Thu Nov 12 08:48:58 1998 --- php3/php3.dsp Fri Jan 29 16:42:14 1999 *************** *** 67,73 **** # 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" /D "DEBUG" /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 --- 67,73 ---- # 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" /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 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" !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 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 Index: php3/php3.dsw diff -c php3/php3.dsw:1.45 php3/php3.dsw:1.46 *** php3/php3.dsw:1.45 Wed Jan 6 13:26:05 1999 --- php3/php3.dsw Fri Jan 29 16:42:14 1999 *************** *** 246,251 **** --- 246,263 ---- ############################################################################### + Project: "php_wc5"=..\..\wc5sdk\php\php_wc5.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "snmp"=.\snmp.dsp - Package Owner=<4> Package=<5> -- 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