From f2ef84a495d645ee2e25016e11e0951a1db165ec Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Tue, 13 Jun 2006 15:57:46 +0000 Subject: [PATCH] Move GINIT definition above re-definition of iconv. Gah. --- ext/iconv/iconv.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index f50a4c71cc..7847451cfd 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -107,6 +107,15 @@ zend_module_entry iconv_module_entry = { 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_BEGIN() 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) { -- 2.50.1