CVS update: php31/ext/standard

Date: Saturday October 17, 1998 @ 16:45 Author: shane Update of /repository/php31/ext/standard In directory asf:/u2/tmp/cvs-serv29817/ext/standard Modified Files: basic_functions.c Log Message: fixes to get 3.1 compiling again under windows. mysql ported from 3.0 then backported to 3.0 Some project file updates porting other extensions from 3.0 in process. fixes to registry functions to support binary Index: php31/ext/standard/basic_functions.c diff -c php31/ext/standard/basic_functions.c:2.19 php31/ext/standard/basic_functions.c:2.20 *** php31/ext/standard/basic_functions.c:2.19 Sat Oct 17 14:19:45 1998 --- php31/ext/standard/basic_functions.c Sat Oct 17 16:45:42 1998 *************** *** 830,835 **** --- 830,840 ---- pval *args[2] = {&key1, &key2}; pval retval; int status; + /* FIXME: This will make this sort VERY slow, need to do something + * else if possible to get the address of the function table into + * this function. Can we pass the address of php3_globals into this? + */ + TLS_VARS; f = *((Bucket **) a); s = *((Bucket **) b); *************** *** 853,860 **** status = call_user_function(&GLOBAL(function_table), NULL, user_compare_func_name, &retval, 2, args); ! pval_destructor(&key1); ! pval_destructor(&key2); if (status==SUCCESS) { convert_to_long(&retval); --- 858,865 ---- status = call_user_function(&GLOBAL(function_table), NULL, user_compare_func_name, &retval, 2, args); ! pval_destructor(&key1 _INLINE_TLS); ! pval_destructor(&key2 _INLINE_TLS); if (status==SUCCESS) { convert_to_long(&retval); -- 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