wez Thu Dec 4 22:14:55 2003 EDT
Modified files:
/php-src/ext/iconv config.w32 iconv.c
Log:
fix zts build
Index: php-src/ext/iconv/config.w32
diff -u php-src/ext/iconv/config.w32:1.2 php-src/ext/iconv/config.w32:1.3
--- php-src/ext/iconv/config.w32:1.2 Wed Dec 3 17:59:47 2003
+++ php-src/ext/iconv/config.w32 Thu Dec 4 22:14:54 2003
@@ -1,15 +1,16 @@
-// $Id: config.w32,v 1.2 2003/12/03 22:59:47 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/05 03:14:54 wez Exp $
// vim: ft=javascript
ARG_WITH("iconv", "iconv support", "no");
-if (PHP_ICONV == "yes") {
- EXTENSION("iconv", "iconv.c");
- AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled");
- AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
- AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv implementation to
use");
- AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or not");
- CHECK_LIB("iconv.lib", "iconv");
- CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS");
+if (PHP_ICONV != "no") {
+ if (CHECK_LIB("iconv.lib", "iconv", PHP_ICONV) &&
CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)) {
+ EXTENSION("iconv", "iconv.c");
+
+ AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled");
+ AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
+ AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv
implementation to use");
+ AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or
not");
+ }
}
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.105 php-src/ext/iconv/iconv.c:1.106
--- php-src/ext/iconv/iconv.c:1.105 Thu Dec 4 18:46:53 2003
+++ php-src/ext/iconv/iconv.c Thu Dec 4 22:14:54 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.105 2003/12/04 23:46:53 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.106 2003/12/05 03:14:54 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -148,8 +148,8 @@
static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *str,
size_t str_nbytes, const char *enc, const char **next_pos, int mode);
-static php_iconv_err_t php_iconv_stream_filter_register_factory();
-static php_iconv_err_t php_iconv_stream_filter_unregister_factory();
+static php_iconv_err_t php_iconv_stream_filter_register_factory(TSRMLS_D);
+static php_iconv_err_t php_iconv_stream_filter_unregister_factory(TSRMLS_D);
/* }}} */
/* {{{ static globals */
@@ -207,7 +207,7 @@
REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_STRICT",
PHP_ICONV_MIME_DECODE_STRICT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_CONTINUE_ON_ERROR",
PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR, CONST_CS | CONST_PERSISTENT);
- if (php_iconv_stream_filter_register_factory() != PHP_ICONV_ERR_SUCCESS) {
+ if (php_iconv_stream_filter_register_factory(TSRMLS_C) !=
PHP_ICONV_ERR_SUCCESS) {
return FAILURE;
}
@@ -218,7 +218,7 @@
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(miconv)
{
- php_iconv_stream_filter_unregister_factory();
+ php_iconv_stream_filter_unregister_factory(TSRMLS_C);
UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
@@ -2523,7 +2523,7 @@
/* }}} */
/* {{{ php_iconv_stream_register_factory */
-static php_iconv_err_t php_iconv_stream_filter_register_factory()
+static php_iconv_err_t php_iconv_stream_filter_register_factory(TSRMLS_D)
{
static php_stream_filter_factory filter_factory = {
php_iconv_stream_filter_factory_create
@@ -2539,7 +2539,7 @@
/* }}} */
/* {{{ php_iconv_stream_unregister_factory */
-static php_iconv_err_t php_iconv_stream_filter_unregister_factory()
+static php_iconv_err_t php_iconv_stream_filter_unregister_factory(TSRMLS_D)
{
if (FAILURE == php_stream_filter_unregister_factory(
php_iconv_stream_filter_ops.label TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
