Fix Win32 (and maybe other ZTS) builds.

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index 63c9d1085ef9badb27da38dab41e5abc7619a40b..875106705f0bfddaef5205ab31c0eeeb57b934c4 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -112,7 +112,7 @@ PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_
 PHPAPI char *php_str_to_str(char *haystack, int length, char *needle,
                int needle_len, char *str, int str_len, int *_new_length);
 PHPAPI void php_trim(pval *str, pval *return_value, int mode);
-void php_trim2(zval *str, zval *what, zval *return_value, int mode);
+PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode);
 PHPAPI void php_strip_tags(char *rbuf, int len, int state, char *allow, int allow_len);
 
 PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result);

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 71bd71f749453ed17865594efe2435094eb965f2..c257df7280fb11bd9e1a7542050bb57364e67839 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -185,6 +185,7 @@ static inline void php_var_serialize_string(smart_str *buf, char *str, int len)
 static inline void php_var_serialize_class_name(smart_str *buf, zval **struc)
 {
        PHP_CLASS_ATTRIBUTES;
+       TSRMLS_FETCH();
 
        PHP_SET_CLASS_ATTRIBUTES(*struc);
        smart_str_appendl(buf, "O:", 2);