helly Sat Jan 4 14:21:22 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dbx dbx.c
Log:
MFH: Fix ZTS-ZE2 build
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.42.2.1 php4/ext/dbx/dbx.c:1.42.2.2
--- php4/ext/dbx/dbx.c:1.42.2.1 Tue Dec 31 11:34:21 2002
+++ php4/ext/dbx/dbx.c Sat Jan 4 14:21:22 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbx.c,v 1.42.2.1 2002/12/31 16:34:21 sebastian Exp $ */
+/* $Id: dbx.c,v 1.42.2.2 2003/01/04 19:21:22 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -85,7 +85,7 @@
return DBX_UNKNOWN;
}
-int split_dbx_handle_object(zval **dbx_object, zval ***pdbx_handle, zval
***pdbx_module, zval ***pdbx_database)
+int split_dbx_handle_object(zval **dbx_object, zval ***pdbx_handle, zval
+***pdbx_module, zval ***pdbx_database TSRMLS_DC)
{
convert_to_object_ex(dbx_object);
if (zend_hash_find(Z_OBJPROP_PP(dbx_object), "handle", 7, (void **)
pdbx_handle)==FAILURE
@@ -334,7 +334,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
&dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
+&dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, "dbx_close: not a valid dbx_handle-object...");
RETURN_LONG(0);
}
@@ -386,7 +386,7 @@
if (ZEND_NUM_ARGS()<min_number_of_arguments ||
ZEND_NUM_ARGS()>number_of_arguments || zend_get_parameters_array_ex(ZEND_NUM_ARGS(),
arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
&dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
+&dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, "dbx_query: not a valid dbx_handle-object...");
RETURN_LONG(0);
}
@@ -560,7 +560,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
&dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
+&dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, "dbx_error: not a valid dbx_handle-object...");
RETURN_LONG(0);
}
@@ -593,7 +593,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
&dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], &dbx_handle, &dbx_module,
+&dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, "dbx_esc: not a valid dbx_handle-object...");
RETURN_NULL();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
