cvs: php4 /ext/gettext gettext.c php_gettext.h

sniper Sun Dec 10 07:53:38 2000 EDT Modified files: /php4/ext/gettext gettext.c php_gettext.h Log: Moved the constants into ext/standard Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.23 php4/ext/gettext/gettext.c:1.24 --- php4/ext/gettext/gettext.c:1.23 Fri Dec 8 08:25:38 2000 +++ php4/ext/gettext/gettext.c Sun Dec 10 07:53:37 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.23 2000/12/08 16:25:38 sniper Exp $ */ +/* $Id: gettext.c,v 1.24 2000/12/10 15:53:37 sniper Exp $ */ #include <stdio.h> #include "php.h" @@ -38,7 +38,7 @@ }; 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 @@ -50,19 +50,6 @@ php_info_print_table_start(); php_info_print_table_row(2, "GNU GetText Support", "enabled"); 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) Index: php4/ext/gettext/php_gettext.h diff -u php4/ext/gettext/php_gettext.h:1.8 php4/ext/gettext/php_gettext.h:1.9 --- php4/ext/gettext/php_gettext.h:1.8 Fri Dec 8 01:20:42 2000 +++ php4/ext/gettext/php_gettext.h Sun Dec 10 07:53:37 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gettext.h,v 1.8 2000/12/08 09:20:42 zak Exp $ */ +/* $Id: php_gettext.h,v 1.9 2000/12/10 15:53:37 sniper Exp $ */ #ifndef PHP_GETTEXT_H #define PHP_GETTEXT_H @@ -30,7 +30,6 @@ #define gettext_module_ptr &php_gettext_module_entry PHP_MINFO_FUNCTION(gettext); -PHP_MINIT_FUNCTION(gettext); PHP_FUNCTION(textdomain); PHP_FUNCTION(gettext);