cvs: php4 /ext/iconv iconv.c

derick Wed Mar 6 06:20:12 2002 EDT Modified files: /php4/ext/iconv iconv.c Log: - Fix build with ZTS Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.30 php4/ext/iconv/iconv.c:1.31 --- php4/ext/iconv/iconv.c:1.30 Sat Mar 2 02:04:59 2002 +++ php4/ext/iconv/iconv.c Wed Mar 6 06:20:11 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.30 2002/03/02 07:04:59 yohgaki Exp $ */ +/* $Id: iconv.c,v 1.31 2002/03/06 11:20:11 derick Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -82,7 +82,7 @@ ZEND_GET_MODULE(iconv) #endif -static int php_iconv_string(const char * in_str, unsigned int in_len, char ** out_str, unsigned int * out_len, const char * in_encoding, const char * out_encoding, int *err); +static int php_iconv_string(const char * in_str, unsigned int in_len, char ** out_str, unsigned int * out_len, const char * in_encoding, const char * out_encoding, int *err TSRMLS_DC); /* {{{ PHP_INI */ @@ -133,7 +133,7 @@ */ static int php_iconv_string(const char *in_p, size_t in_len, char **out, size_t *out_len, - const char *in_charset, const char *out_charset, int *err) + const char *in_charset, const char *out_charset, int *err TSRMLS_DC) { #if HAVE_LIBICONV /* No errno for libiconv(?) */ @@ -286,7 +286,7 @@ if (php_iconv_string(Z_STRVAL_PP(in_buffer), Z_STRLEN_PP(in_buffer), &out_buffer, &out_len, - Z_STRVAL_PP(in_charset), Z_STRVAL_PP(out_charset), &err) == SUCCESS) { + Z_STRVAL_PP(in_charset), Z_STRVAL_PP(out_charset), &err TSRMLS_CC) == SUCCESS) { RETVAL_STRINGL(out_buffer, out_len, 0); } else { RETURN_FALSE; @@ -315,7 +315,7 @@ &out_buffer, &out_len, ICONVG(internal_encoding), ICONVG(output_encoding), - &err)==SUCCESS) { + &err TSRMLS_CC)==SUCCESS) { RETVAL_STRINGL(out_buffer, out_len, 0); } else { zval_dtor(return_value);