Move GINIT definition above re-definition of iconv. Gah.

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index f50a4c71cc2f4400d1787e703cca80d49bc824aa..7847451cfd61169ffb52d6fb512eace3c3f8bd1f 100644 (file)
--- 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)
 {