Fix ZTS-ZE2 build

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index fbf9a3920f2828d9dcce8e394ece6120294380df..9a629b5ff5dc945ff097b10e654e0d18883b005b 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -34,6 +34,8 @@ static zval *current_section;
 
 static void browscap_entry_dtor(zval *pvalue)
 {
+       TSRMLS_FETCH();
+
        if (Z_TYPE_P(pvalue) == IS_OBJECT) {
                zend_hash_destroy(Z_OBJPROP_P(pvalue));
                free(Z_OBJPROP_P(pvalue));
@@ -93,6 +95,8 @@ static void convert_browscap_pattern(zval *pattern)
  */
 static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg)
 {
+       TSRMLS_FETCH();
+
        if (!arg1) {
                return;
        }
@@ -185,6 +189,8 @@ PHP_MSHUTDOWN_FUNCTION(browscap)
  */
 static int browser_reg_compare(zval **browser, int num_args, va_list args, zend_hash_key *key)
 {
+       TSRMLS_FETCH();
+
        zval **browser_name;
        regex_t r;
        char *lookup_browser_name = va_arg(args, char *);

diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c
index 4320706473f00cb6a662f266821dbf5a6a2ddc41..a5f74b1a844e25afdfbb1600df8c93c73712fed7 100644 (file)
--- a/ext/standard/incomplete_class.c
+++ b/ext/standard/incomplete_class.c
@@ -39,7 +39,7 @@ static void incomplete_class_message(zend_property_reference *ref, int error_typ
        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 @@ zend_class_entry *php_create_incomplete_class(TSRMLS_D)
 
 /* {{{ 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 @@ char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del)
 
 /* {{{ 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;
 

diff --git a/ext/standard/php_incomplete_class.h b/ext/standard/php_incomplete_class.h
index e0f5a7875f17883c98a39ca054ed0ec23e320186..76c6e4b750f93f1029eea14bffa49efbfe027a15 100644 (file)
--- a/ext/standard/php_incomplete_class.h
+++ b/ext/standard/php_incomplete_class.h
@@ -53,8 +53,8 @@ extern "C" {
        
 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
 };

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 403fbed930852c84f5d2d517d48d60ac311e59c7..a85ae6c94f4cae98db2ad768ef8e7f97f667b7eb 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -446,7 +446,7 @@ yy22:
        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);
        }
 

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index f0442a0cf5c7dcba6bd001365b6e329ffc06720d..9050143646abb0d862d0ed80199ffbb5d8c18c10 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -956,7 +956,7 @@ static void php_wddx_pop_element(void *user_data, const char *name)
                                                                                (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 */