helly Sat Jan 4 14:42:37 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard incomplete_class.c php_incomplete_class.h var_unserializer.c /php4/ext/wddx wddx.c Log: Fix ZTS-ZE2 build Index: php4/ext/standard/incomplete_class.c diff -u php4/ext/standard/incomplete_class.c:1.14.4.2 php4/ext/standard/incomplete_class.c:1.14.4.3 --- php4/ext/standard/incomplete_class.c:1.14.4.2 Tue Dec 31 11:35:29 2002 +++ php4/ext/standard/incomplete_class.c Sat Jan 4 14:42:37 2003 @@ -17,7 +17,7 @@ */ -/* $Id: incomplete_class.c,v 1.14.4.2 2002/12/31 16:35:29 sebastian Exp $ */ +/* $Id: incomplete_class.c,v 1.14.4.3 2003/01/04 19:42:37 helly Exp $ */ #include "php.h" #include "basic_functions.h" @@ -39,7 +39,7 @@ char *class_name; TSRMLS_FETCH(); - class_name = php_lookup_class_name(ref->object, NULL, 0); + class_name = php_lookup_class_name(ref->object, NULL, 0 TSRMLS_CC); if (!class_name) class_name = estrdup("unknown"); @@ -102,7 +102,7 @@ /* {{{ php_lookup_class_name */ -char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del) +char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del TSRMLS_DC) { zval **val; char *retval = NULL; @@ -126,7 +126,7 @@ /* {{{ php_store_class_name */ -void php_store_class_name(zval *object, const char *name, size_t len) +void php_store_class_name(zval *object, const char *name, size_t len TSRMLS_DC) { zval *val; Index: php4/ext/standard/php_incomplete_class.h diff -u php4/ext/standard/php_incomplete_class.h:1.9.4.1 php4/ext/standard/php_incomplete_class.h:1.9.4.2 --- php4/ext/standard/php_incomplete_class.h:1.9.4.1 Tue Dec 31 11:35:33 2002 +++ php4/ext/standard/php_incomplete_class.h Sat Jan 4 14:42:37 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_incomplete_class.h,v 1.9.4.1 2002/12/31 16:35:33 sebastian Exp $ */ +/* $Id: php_incomplete_class.h,v 1.9.4.2 2003/01/04 19:42:37 helly Exp $ */ #ifndef PHP_INCOMPLETE_CLASS_H #define PHP_INCOMPLETE_CLASS_H @@ -53,8 +53,8 @@ zend_class_entry *php_create_incomplete_class(TSRMLS_D); -char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del); -void php_store_class_name(zval *object, const char *name, size_t len); +char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del TSRMLS_DC); +void php_store_class_name(zval *object, const char *name, size_t len TSRMLS_DC); #ifdef __cplusplus }; Index: php4/ext/standard/var_unserializer.c diff -u php4/ext/standard/var_unserializer.c:1.18 php4/ext/standard/var_unserializer.c:1.18.4.1 --- php4/ext/standard/var_unserializer.c:1.18 Mon Aug 19 16:02:59 2002 +++ php4/ext/standard/var_unserializer.c Sat Jan 4 14:42:37 2003 @@ -446,7 +446,7 @@ elements = object_common1(UNSERIALIZE_PASSTHRU, ce); if (incomplete_class) { - php_store_class_name(*rval, class_name, len2); + php_store_class_name(*rval, class_name, len2 TSRMLS_CC); efree(class_name); } Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.96.2.1 php4/ext/wddx/wddx.c:1.96.2.2 --- php4/ext/wddx/wddx.c:1.96.2.1 Tue Dec 31 11:35:42 2002 +++ php4/ext/wddx/wddx.c Sat Jan 4 14:42:37 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.96.2.1 2002/12/31 16:35:42 sebastian Exp $ */ +/* $Id: wddx.c,v 1.96.2.2 2003/01/04 19:42:37 helly Exp $ */ #include "php.h" #include "php_wddx.h" @@ -956,7 +956,7 @@ (void *) &tmp, sizeof(zval *), 0); if (incomplete_class) { - php_store_class_name(obj, Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data)); + php_store_class_name(obj, +Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data), TSRMLS_CC); } /* Clean up old array entry */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php