I didn't have time to play around with HEAD code, the patch does not apply cleanly due to unicode, once I do the signature will be adjusted to be the same.

On 29-Aug-06, at 3:35 AM, Antony Dovgal wrote:

On 29.08.2006 03:33, Ilia Alshanetsky wrote:
iliaa           Mon Aug 28 23:33:37 2006 UTC
  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard       string.c php_string.h   Log:
  Adjust code to avoid TSRMLS_FETCH

@@ -134,7 +134,7 @@
PHPAPI size_t php_strip_tags(char *rbuf, int len, int *state, char *allow, int allow_len); PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_len, zval *result, int case_sensitivity, int *replace_count); PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, zval *result);
-PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value);
+PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC);

Having different php_implode() signatures in 5_2 and HEAD doesn't look like a nice solution to me. I'd leave it with TSRMLS_FETCH() (or change it in HEAD too, but why break something that was this way for years?).

--
Wbr, Antony Dovgal

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Ilia Alshanetsky

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to