diff options
| author | Andi Gutmans <andi@php.net> | 2002-07-08 18:29:54 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-07-08 18:29:54 +0000 |
| commit | b4146638f03bea26fa6c71afc0f77cfb6565f1af (patch) | |
| tree | 88c577e9936b74adda76645a8521729ef8baf700 | |
| parent | 6162414fd64c620754c290cb3030e1cf102ad5eb (diff) | |
| download | php-git-b4146638f03bea26fa6c71afc0f77cfb6565f1af.tar.gz | |
- Fix TSRMLS_* stuff
| -rw-r--r-- | ext/standard/cyr_convert.c | 4 | ||||
| -rw-r--r-- | ext/standard/file.c | 4 | ||||
| -rw-r--r-- | ext/standard/type.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/cyr_convert.c b/ext/standard/cyr_convert.c index 7437104f48..51857c598a 100644 --- 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 c7b53e8ae0..dbd15ae99a 100644 --- 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 06b830cc06..b6a61c3173 100644 --- 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; } |