andrei Tue Jun 13 15:57:46 2006 UTC
Modified files:
/php-src/ext/iconv iconv.c
Log:
Move GINIT definition above re-definition of iconv. Gah.
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/iconv.c?r1=1.135&r2=1.136&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.135 php-src/ext/iconv/iconv.c:1.136
--- php-src/ext/iconv/iconv.c:1.135 Tue Jun 13 13:12:18 2006
+++ php-src/ext/iconv/iconv.c Tue Jun 13 15:57:46 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.135 2006/06/13 13:12:18 dmitry Exp $ */
+/* $Id: iconv.c,v 1.136 2006/06/13 15:57:46 andrei Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -107,6 +107,15 @@
ZEND_GET_MODULE(iconv)
#endif
+/* {{{ PHP_GINIT_FUNCTION */
+static PHP_GINIT_FUNCTION(iconv)
+{
+ iconv_globals->input_encoding = NULL;
+ iconv_globals->output_encoding = NULL;
+ iconv_globals->internal_encoding = NULL;
+}
+/* }}} */
+
#ifdef HAVE_LIBICONV
#define iconv libiconv
#endif
@@ -156,15 +165,6 @@
PHP_INI_END()
/* }}} */
-/* {{{ PHP_GINIT_FUNCTION */
-static PHP_GINIT_FUNCTION(iconv)
-{
- iconv_globals->input_encoding = NULL;
- iconv_globals->output_encoding = NULL;
- iconv_globals->internal_encoding = NULL;
-}
-/* }}} */
-
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(miconv)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
