CVS update: php31/main

Date: Thursday August 13, 1998 @ 19:51 Author: shane Update of /repository/php31/main In directory asf:/tmp/cvs-serv9479/main Modified Files: constants.c constants.h control_structures.h internal_functions.c operators.c php3_hash.c Log Message: 3.0->3.1 patches. *** /main should be caught up now. *** Index: php31/main/constants.c diff -c php31/main/constants.c:2.1 php31/main/constants.c:2.2 *** php31/main/constants.c:2.1 Fri Jul 10 12:52:46 1998 --- php31/main/constants.c Thu Aug 13 19:51:11 1998 *************** *** 78,84 **** _php3_hash_apply_with_argument(&GLOBAL(php3_constants), (int (*)(void *,void *)) clean_module_constant, (void *) &module_number); } ! int php3_startup_constants() { char *php3_os; #if WIN32|WINNT --- 78,84 ---- _php3_hash_apply_with_argument(&GLOBAL(php3_constants), (int (*)(void *,void *)) clean_module_constant, (void *) &module_number); } ! int php3_startup_constants(void) { char *php3_os; #if WIN32|WINNT *************** *** 119,125 **** } ! int php3_shutdown_constants() { TLS_VARS; _php3_hash_destroy(&GLOBAL(php3_constants)); --- 119,125 ---- } ! int php3_shutdown_constants(void) { TLS_VARS; _php3_hash_destroy(&GLOBAL(php3_constants)); *************** *** 127,133 **** } ! void clean_non_persistent_constants() { TLS_VARS; _php3_hash_apply(&GLOBAL(php3_constants), (int (*)(void *)) clean_non_persistent_constant); --- 127,133 ---- } ! void clean_non_persistent_constants(void) { TLS_VARS; _php3_hash_apply(&GLOBAL(php3_constants), (int (*)(void *)) clean_non_persistent_constant); Index: php31/main/constants.h diff -c php31/main/constants.h:2.0 php31/main/constants.h:2.1 *** php31/main/constants.h:2.0 Fri Jul 3 09:17:14 1998 --- php31/main/constants.h Thu Aug 13 19:51:11 1998 *************** *** 23,31 **** #define REGISTER_MAIN_STRINGL_CONSTANT(name,str,len,flags) php3_register_stringl_constant((name),sizeof(name),(str),(len),(flags),0) extern void clean_module_constants(int module_number); ! extern int php3_startup_constants(); ! extern int php3_shutdown_constants(); ! extern void clean_non_persistent_constants(); extern PHPAPI void php3_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number); extern PHPAPI void php3_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number); extern PHPAPI void php3_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number); --- 23,31 ---- #define REGISTER_MAIN_STRINGL_CONSTANT(name,str,len,flags) php3_register_stringl_constant((name),sizeof(name),(str),(len),(flags),0) extern void clean_module_constants(int module_number); ! extern int php3_startup_constants(void); ! extern int php3_shutdown_constants(void); ! extern void clean_non_persistent_constants(void); extern PHPAPI void php3_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number); extern PHPAPI void php3_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number); extern PHPAPI void php3_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number); Index: php31/main/control_structures.h diff -c php31/main/control_structures.h:2.0 php31/main/control_structures.h:2.1 *** php31/main/control_structures.h:2.0 Fri Jul 3 09:17:14 1998 --- php31/main/control_structures.h Thu Aug 13 19:51:11 1998 *************** *** 29,35 **** */ ! /* $Id: control_structures.h,v 2.0 1998/07/03 13:17:14 rasmus Exp $ */ #ifndef _CONTROL_STRUCTURES_H --- 29,35 ---- */ ! /* $Id: control_structures.h,v 2.1 1998/08/13 23:51:11 shane Exp $ */ #ifndef _CONTROL_STRUCTURES_H *************** *** 75,80 **** --- 75,81 ---- extern int init_resource_plist(void); extern void destroy_resource_list(void); extern void destroy_resource_plist(void); + extern int clean_module_resource(list_entry *, int *); extern inline void start_display_source(int start_in_php INLINE_TLS); #endif Index: php31/main/internal_functions.c diff -c php31/main/internal_functions.c:2.2 php31/main/internal_functions.c:2.3 *** php31/main/internal_functions.c:2.2 Fri Jul 17 12:03:42 1998 --- php31/main/internal_functions.c Thu Aug 13 19:51:11 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 2.2 1998/07/17 16:03:42 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 2.3 1998/08/13 23:51:11 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 82,87 **** --- 82,88 ---- #include "ext/odbc/php3_unified_odbc.h" #include "ext/snmp/php3_snmp.h" #include "ext/zlib/php3_zlib.h" + #include "ext/com/php3_COM.h" #ifndef THREAD_SAFE HashTable list_destructors,module_registry; *************** *** 135,140 **** --- 136,142 ---- {"SNMP", snmp_module_ptr}, {"Pack/Unpack", pack_module_ptr}, {"Zlib", php3_zlib_module_ptr}, + {"Win32 COM", COM_module_ptr}, {NULL, NULL} }; *************** *** 279,284 **** --- 281,287 ---- tmp.type = IS_INTERNAL_FUNCTION; tmp.value.func.addr.internal = function_ptr; + tmp.value.func.arg_types = NULL; return _php3_hash_update(arg->value.ht, key, strlen(key)+1, (void *) &tmp, sizeof(pval), NULL); } *************** *** 652,658 **** /* return the next free module number */ ! int _php3_next_free_module() { TLS_VARS; return ++GLOBAL(module_count); --- 655,661 ---- /* return the next free module number */ ! int _php3_next_free_module(void) { TLS_VARS; return ++GLOBAL(module_count); Index: php31/main/operators.c diff -c php31/main/operators.c:2.1 php31/main/operators.c:2.2 *** php31/main/operators.c:2.1 Fri Jul 17 12:03:44 1998 --- php31/main/operators.c Thu Aug 13 19:51:12 1998 *************** *** 29,35 **** */ ! /* $Id: operators.c,v 2.1 1998/07/17 16:03:44 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: operators.c,v 2.2 1998/08/13 23:51:12 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 776,781 **** --- 776,784 ---- result->value.dval = (op1->type == IS_LONG ? (double) op1->value.lval : op1->value.dval) - (op2->type == IS_LONG ? (double) op2->value.lval : op2->value.dval); return SUCCESS; } + if ((op1->type & IS_HASH) && (op2->type & IS_HASH)) { + php3_error(E_WARNING,"Cannot compare arrays or objects"); + } yystype_destructor(op1 _INLINE_TLS); yystype_destructor(op2 _INLINE_TLS); var_reset(result); Index: php31/main/php3_hash.c diff -c php31/main/php3_hash.c:2.0 php31/main/php3_hash.c:2.1 *** php31/main/php3_hash.c:2.0 Fri Jul 3 09:17:26 1998 --- php31/main/php3_hash.c Thu Aug 13 19:51:12 1998 *************** *** 29,35 **** */ ! /* $Id: php3_hash.c,v 2.0 1998/07/03 13:17:26 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 29,35 ---- */ ! /* $Id: php3_hash.c,v 2.1 1998/08/13 23:51:12 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 1050,1056 **** *pData = res->pData; return SUCCESS; } - PHPAPI uint _php3_hash_next_free_element(HashTable *ht) { --- 1050,1055 ---- -- 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