felipe                                   Thu, 13 Aug 2009 20:10:18 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=287264

Log:
- Fix ZTS build

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/string.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/string.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/string.c  2009-08-13 19:02:19 UTC 
(rev 287263)
+++ php/php-src/branches/PHP_5_3/ext/standard/string.c  2009-08-13 20:10:18 UTC 
(rev 287264)
@@ -1577,7 +1577,7 @@

 /* {{{ php_needle_char
  */
-static int php_needle_char(zval *needle, char *target)
+static int php_needle_char(zval *needle, char *target TSRMLS_DC)
 {
        switch (Z_TYPE_P(needle)) {
                case IS_LONG:
@@ -1639,7 +1639,7 @@
                found = php_stristr(haystack_dup, orig_needle,  haystack_len, 
Z_STRLEN_P(needle));
                efree(orig_needle);
        } else {
-               if(php_needle_char(needle, needle_char) != SUCCESS) {
+               if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
                        efree(haystack_dup);
                        RETURN_FALSE;
                }
@@ -1687,7 +1687,7 @@

                found = php_memnstr(haystack, Z_STRVAL_P(needle), 
Z_STRLEN_P(needle), haystack + haystack_len);
        } else {
-               if(php_needle_char(needle, needle_char) != SUCCESS) {
+               if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
                        RETURN_FALSE;
                }
                needle_char[1] = 0;
@@ -1742,7 +1742,7 @@
                                        Z_STRLEN_P(needle),
                                        haystack + haystack_len);
        } else {
-               if(php_needle_char(needle, needle_char) != SUCCESS) {
+               if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
                        RETURN_FALSE;
                }
                needle_char[1] = 0;
@@ -1799,7 +1799,7 @@
                php_strtolower(needle_dup, Z_STRLEN_P(needle));
                found = php_memnstr(haystack_dup + offset, needle_dup, 
Z_STRLEN_P(needle), haystack_dup + haystack_len);
        } else {
-               if(php_needle_char(needle, needle_char) != SUCCESS) {
+               if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
                        efree(haystack_dup);
                        RETURN_FALSE;
                }
@@ -1842,7 +1842,7 @@
                needle = Z_STRVAL_P(zneedle);
                needle_len = Z_STRLEN_P(zneedle);
        } else {
-               if(php_needle_char(zneedle, ord_needle) != SUCCESS) {
+               if (php_needle_char(zneedle, ord_needle TSRMLS_CC) != SUCCESS) {
                        RETURN_FALSE;
                }
                ord_needle[1] = '\0';
@@ -1916,7 +1916,7 @@
                needle = Z_STRVAL_P(zneedle);
                needle_len = Z_STRLEN_P(zneedle);
        } else {
-               if(php_needle_char(zneedle, ord_needle) != SUCCESS) {
+               if (php_needle_char(zneedle, ord_needle TSRMLS_CC) != SUCCESS) {
                        RETURN_FALSE;
                }
                ord_needle[1] = '\0';
@@ -2019,7 +2019,7 @@
                found = zend_memrchr(haystack, *Z_STRVAL_P(needle), 
haystack_len);
        } else {
                char needle_chr;
-               if(php_needle_char(needle, &needle_chr) != SUCCESS) {
+               if (php_needle_char(needle, &needle_chr TSRMLS_CC) != SUCCESS) {
                        RETURN_FALSE;
                }


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

Reply via email to