Moved the constants into ext/standard

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 488795b57e33dd9fec9867271959a7257d4fafc0..2521a3f709f77f100d945512408b97f0497d950e 100644 (file)
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -38,7 +38,7 @@ function_entry php_gettext_functions[] = {
 };
 
 zend_module_entry php_gettext_module_entry = {
-       "gettext", php_gettext_functions, PHP_MINIT(gettext), NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES
+       "gettext", php_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_GETTEXT
@@ -52,19 +52,6 @@ PHP_MINFO_FUNCTION(gettext)
        php_info_print_table_end();
 }
 
-
-PHP_MINIT_FUNCTION(gettext)
-{
-       REGISTER_LONG_CONSTANT("LC_CTYPE", LC_CTYPE, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("LC_NUMERIC", LC_NUMERIC, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("LC_TIME", LC_TIME, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("LC_COLLATE", LC_COLLATE, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("LC_MONETARY", LC_MONETARY, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("LC_MESSAGES", LC_MESSAGES, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("LC_ALL", LC_ALL, CONST_CS | CONST_PERSISTENT);
-       return SUCCESS;
-}
-
 /* {{{ proto string textdomain(string domain)
    Set the textdomain to "domain". Returns the current domain */
 PHP_FUNCTION(textdomain)

diff --git a/ext/gettext/php_gettext.h b/ext/gettext/php_gettext.h
index 2c649390f895338527c2177ab609233b33bf6bf5..73822af568fdd17c5de7888820abebc012290173 100644 (file)
--- a/ext/gettext/php_gettext.h
+++ b/ext/gettext/php_gettext.h
@@ -30,7 +30,6 @@ extern zend_module_entry php_gettext_module_entry;
 #define gettext_module_ptr &php_gettext_module_entry
 
 PHP_MINFO_FUNCTION(gettext);
-PHP_MINIT_FUNCTION(gettext);
 
 PHP_FUNCTION(textdomain);
 PHP_FUNCTION(gettext);