CVS update: php3

Date: Friday October 23, 1998 @ 16:46 Author: shane Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv13790 Modified Files: dbm.dsp internal_functions.h language-parser.y php3.dsp php3.dsw variables.c Log Message: xml compiles on win32 now as a dll Index: php3/dbm.dsp diff -c php3/dbm.dsp:1.13 php3/dbm.dsp:1.14 *** php3/dbm.dsp:1.13 Fri Oct 23 16:07:13 1998 --- php3/dbm.dsp Fri Oct 23 16:46:53 1998 *************** *** 69,75 **** # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../" /I "../../include" /D NDBM=1 /D GDBM=0 /D BSD2=1 /D "DEBUG" /D "_DEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" --- 69,75 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../" /I "../../include" /D NDBM=1 /D GDBM=0 /D BSD2=1 /D "DEBUG" /D "_DEBUG" /D COMPILE_DL=1 /D "MSVC5" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" Index: php3/internal_functions.h diff -c php3/internal_functions.h:1.126 php3/internal_functions.h:1.127 *** php3/internal_functions.h:1.126 Tue Jul 28 18:00:00 1998 --- php3/internal_functions.h Fri Oct 23 16:46:54 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.h,v 1.126 1998/07/28 22:00:00 rasmus Exp $ */ #ifndef _INTERNAL_FUNCTIONS_H --- 29,35 ---- */ ! /* $Id: internal_functions.h,v 1.127 1998/10/23 20:46:54 shane Exp $ */ #ifndef _INTERNAL_FUNCTIONS_H *************** *** 90,96 **** extern inline PHPAPI int add_get_index_string(pval *arg, uint idx, char *str, void **dest, int duplicate); extern inline PHPAPI int add_get_index_stringl(pval *arg, uint idx, char *str, uint length, void **dest, int duplicate); ! extern int call_user_function(HashTable *function_table, pval *object, pval *function_name, pval *retval, int param_count, pval *params[]); #define add_property_long(arg,key,n) add_assoc_long((arg),(key),(n)) #define add_property_double(arg,key,d) add_assoc_double((arg),(key),(n)) --- 90,96 ---- extern inline PHPAPI int add_get_index_string(pval *arg, uint idx, char *str, void **dest, int duplicate); extern inline PHPAPI int add_get_index_stringl(pval *arg, uint idx, char *str, uint length, void **dest, int duplicate); ! extern PHPAPI int call_user_function(HashTable *function_table, pval *object, pval *function_name, pval *retval, int param_count, pval *params[]); #define add_property_long(arg,key,n) add_assoc_long((arg),(key),(n)) #define add_property_double(arg,key,d) add_assoc_double((arg),(key),(n)) Index: php3/language-parser.y diff -c php3/language-parser.y:1.176 php3/language-parser.y:1.177 *** php3/language-parser.y:1.176 Sun Oct 4 08:26:59 1998 --- php3/language-parser.y Fri Oct 23 16:46:54 1998 *************** *** 31,37 **** */ ! /* $Id: language-parser.y,v 1.176 1998/10/04 12:26:59 zeev Exp $ */ /* --- 31,37 ---- */ ! /* $Id: language-parser.y,v 1.177 1998/10/23 20:46:54 shane Exp $ */ /* *************** *** 736,742 **** /*** Manhattan project ***/ /* Be able to call user-levle functions from C */ /* "A beer and serious lack of sleep do wonders" -- Zeev */ ! int call_user_function(HashTable *function_table, pval *object, pval *function_name, pval *retval, int param_count, pval *params[]) { pval *func; pval return_offset; --- 736,742 ---- /*** Manhattan project ***/ /* Be able to call user-levle functions from C */ /* "A beer and serious lack of sleep do wonders" -- Zeev */ ! PHPAPI int call_user_function(HashTable *function_table, pval *object, pval *function_name, pval *retval, int param_count, pval *params[]) { pval *func; pval return_offset; Index: php3/php3.dsp diff -c php3/php3.dsp:1.46 php3/php3.dsp:1.47 *** php3/php3.dsp:1.46 Fri Oct 23 16:07:13 1998 --- php3/php3.dsp Fri Oct 23 16:46:55 1998 *************** *** 312,326 **** # End Source File # Begin Source File ! SOURCE=.\functions\number.c # End Source File # Begin Source File ! SOURCE=.\functions\number.h # End Source File # Begin Source File ! SOURCE=.\functions\oracle_hack.c # End Source File # Begin Source File --- 312,326 ---- # End Source File # Begin Source File ! SOURCE=.\functions\mod_callbacks.c # End Source File # Begin Source File ! SOURCE=.\functions\number.c # End Source File # Begin Source File ! SOURCE=.\functions\number.h # End Source File # Begin Source File Index: php3/php3.dsw diff -c php3/php3.dsw:1.40 php3/php3.dsw:1.41 *** php3/php3.dsw:1.40 Sat Oct 3 15:10:06 1998 --- php3/php3.dsw Fri Oct 23 16:46:55 1998 *************** *** 222,227 **** --- 222,239 ---- ############################################################################### + Project: "xml"=.\xml.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "zlib"=.\zlib.dsp - Package Owner=<4> Package=<5> Index: php3/variables.c diff -c php3/variables.c:1.156 php3/variables.c:1.157 *** php3/variables.c:1.156 Sat Oct 10 19:39:55 1998 --- php3/variables.c Fri Oct 23 16:46:55 1998 *************** *** 29,35 **** */ ! /* $Id: variables.c,v 1.156 1998/10/10 23:39:55 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: variables.c,v 1.157 1998/10/23 20:46:55 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 92,98 **** } ! void php3tls_pval_destructor(pval *pvalue) { TLS_VARS; --- 92,98 ---- } ! PHPAPI void php3tls_pval_destructor(pval *pvalue) { TLS_VARS; -- 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