- Fix TSRMLS_* stuff

diff --git a/ext/standard/cyr_convert.c b/ext/standard/cyr_convert.c
index 7437104f48f02a0e877810c675fecb9771f09266..51857c598a13e4ab246d8587d8aad0adc1851261 100644 (file)
--- a/ext/standard/cyr_convert.c
+++ b/ext/standard/cyr_convert.c
@@ -201,7 +201,7 @@ _cyr_mac = {
 *    d - x-cp866
 *    m - x-mac-cyrillic
 *****************************************************************************/
-static char * php_convert_cyr_string(unsigned char *str, int length, char from, char to)
+static char * php_convert_cyr_string(unsigned char *str, int length, char from, char to TSRMLS_DC)
 {
        const unsigned char *from_table, *to_table;
        unsigned char tmp;
@@ -284,7 +284,7 @@ PHP_FUNCTION(convert_cyr_string)
 
        str = (unsigned char*) estrndup(Z_STRVAL_PP(str_arg), Z_STRLEN_PP(str_arg));
        
-       php_convert_cyr_string(str, Z_STRLEN_PP(str_arg), Z_STRVAL_PP(fr_cs)[0], Z_STRVAL_PP(to_cs)[0]);
+       php_convert_cyr_string(str, Z_STRLEN_PP(str_arg), Z_STRVAL_PP(fr_cs)[0], Z_STRVAL_PP(to_cs)[0] TSRMLS_CC);
        RETVAL_STRING((char *)str, 0)
 }
 /* }}} */

diff --git a/ext/standard/file.c b/ext/standard/file.c
index c7b53e8ae01badd5591d490144388f624dbac002..dbd15ae99ae277c828eaa73e3544a2c9b05211bf 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -957,7 +957,7 @@ PHPAPI PHP_FUNCTION(feof)
 /* }}} */
 
 /* TODO: move to main/network.c */
-PHPAPI int php_set_sock_blocking(int socketd, int block)
+PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
 {
       int ret = SUCCESS;
       int flags;
@@ -1013,7 +1013,7 @@ PHP_FUNCTION(socket_set_blocking)
                        RETURN_FALSE;
                }
 
-               if (php_set_sock_blocking(socketd, block) == FAILURE)
+               if (php_set_sock_blocking(socketd, block TSRMLS_CC) == FAILURE)
                        RETURN_FALSE;
 
                php_stream_sock_set_blocking((php_stream*)what, block == 0 ? 0 : 1 TSRMLS_CC);

diff --git a/ext/standard/type.c b/ext/standard/type.c
index 06b830cc06367ff2d8680a0319c2b0e2d4485fb6..b6a61c3173b84eba1901440c96eb1bdf97731b01 100644 (file)
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -195,7 +195,7 @@ static void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type)
        pval **arg;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
-               php_error (E_WARNING, "%s(): Only one argument expected", get_active_function_name (TSRMLS_CC));
+               php_error(E_WARNING, "%s(): Only one argument expected", get_active_function_name(TSRMLS_C));
                RETURN_FALSE;
        }