From: Marcus Boerger <helly@php.net>
Date: Sat, 4 Jan 2003 19:51:46 +0000 (+0000)
Subject: Fix ZTS-ZE2 (After Cygwin now for the rest)
X-Git-Tag: PHP_4_3_before_13561_fix~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b05115978cc99a2274304edcb95403b0d9e0b148;p=php

Fix ZTS-ZE2 (After Cygwin now for the rest)
---

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 9a629b5ff5..2f9e97d585 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -189,13 +189,13 @@ 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 *);
 	zval **found_browser_entry = va_arg(args, zval **);
 
+	TSRMLS_FETCH();
+
 	if (*found_browser_entry) { /* already found */
 		return 0;
 	}
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 9050143646..76fe93ddc1 100644
--- 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), TSRMLS_CC);
+							php_store_class_name(obj, Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data) TSRMLS_CC);
 						}
 
 						/* Clean up old array entry */