update php_trim as well...

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index f42020d1b6f2844ced078fe0884612ae9d1e9beb..4d04c9fc6b3240280353ea50fe476a4646ace994 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -113,7 +113,7 @@ PHPAPI void php_dirname(char *str, int len);
 PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len);
 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(zval *str, zval *return_value, int mode TSRMLS_DC);
+PHPAPI void php_trim(zval **str, zval *return_value, int mode TSRMLS_DC);
 PHPAPI void php_trim2(zval **str, zval **what, zval *return_value, int mode TSRMLS_DC);
 PHPAPI void php_strip_tags(char *rbuf, int len, int state, char *allow, int allow_len);
 

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 33e925d7e47bd9dc79d51c637397981ce1059d35..2b1a18c42e56b3fffcea3bcd182942765d87baa6 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -488,7 +488,7 @@ int php_charmask(unsigned char *input, int len, char *mask TSRMLS_DC)
 /* {{{ php_trim
        Compatibility function, ports old-API to new one. (DEPRECATED)
 */
-void php_trim(zval *str, zval *return_value, int mode TSRMLS_DC)
+void php_trim(zval **str, zval *return_value, int mode TSRMLS_DC)
 {
        php_trim2(str, NULL, return_value, mode TSRMLS_CC);
 }