cvs: php4 /ext/standard php_string.h var.c

sbergmann Sat Aug 4 01:22:55 2001 EDT Modified files: /php4/ext/standard php_string.h var.c Log: Fix Win32 (and maybe other ZTS) builds. Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.43 php4/ext/standard/php_string.h:1.44 --- php4/ext/standard/php_string.h:1.43 Fri Aug 3 19:09:05 2001 +++ php4/ext/standard/php_string.h Sat Aug 4 01:22:55 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.43 2001/08/03 23:09:05 jeroen Exp $ */ +/* $Id: php_string.h,v 1.44 2001/08/04 05:22:55 sbergmann Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -112,7 +112,7 @@ 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); Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.105 php4/ext/standard/var.c:1.106 --- php4/ext/standard/var.c:1.105 Fri Aug 3 23:30:38 2001 +++ php4/ext/standard/var.c Sat Aug 4 01:22:55 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.105 2001/08/04 03:30:38 sas Exp $ */ +/* $Id: var.c,v 1.106 2001/08/04 05:22:55 sbergmann Exp $ */ /* {{{ includes @@ -185,6 +185,7 @@ 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);