From: Andrei Zmievski <andrei@php.net>
Date: Tue, 13 Jun 2006 15:57:46 +0000 (+0000)
Subject: Move GINIT definition above re-definition of iconv. Gah.
X-Git-Tag: RELEASE_1_0_0RC1~2732
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2ef84a495d645ee2e25016e11e0951a1db165ec;p=php

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

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)
 {