summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Zmievski <andrei@php.net>2006-04-21 19:35:26 +0000
committerAndrei Zmievski <andrei@php.net>2006-04-21 19:35:26 +0000
commit2bbced4bce3876c8d6e199b4cb264ba01ee35a56 (patch)
treed86b77d3655c61cdee4ec61acd076f2c761339c5
parent24988a088c076113c08870c98c430d4f09502fa9 (diff)
downloadphp-git-2bbced4bce3876c8d6e199b4cb264ba01ee35a56.tar.gz
Rename i18_loc_* to locale_*.
-rw-r--r--ext/unicode/locale.c8
-rw-r--r--ext/unicode/php_unicode.h4
-rw-r--r--ext/unicode/unicode.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/ext/unicode/locale.c b/ext/unicode/locale.c
index bc28aeabd7..fbf81940f6 100644
--- a/ext/unicode/locale.c
+++ b/ext/unicode/locale.c
@@ -40,9 +40,9 @@ static void php_canonicalize_locale_id(char **target, int32_t *target_len, char
*target_len = canonicalized_len;
}
-/* {{{ proto string i18n_loc_get_default(void) U
+/* {{{ proto string locale_get_default(void) U
Returns default locale */
-PHP_FUNCTION(i18n_loc_get_default)
+PHP_FUNCTION(locale_get_default)
{
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
return;
@@ -52,9 +52,9 @@ PHP_FUNCTION(i18n_loc_get_default)
}
/* }}} */
-/* {{{ proto bool i18n_loc_set_default(string locale) U
+/* {{{ proto bool locale_set_default(string locale) U
Sets default locale */
-PHP_FUNCTION(i18n_loc_set_default)
+PHP_FUNCTION(locale_set_default)
{
char *locale;
int locale_len;
diff --git a/ext/unicode/php_unicode.h b/ext/unicode/php_unicode.h
index d4ffab70ab..b3b53181c3 100644
--- a/ext/unicode/php_unicode.h
+++ b/ext/unicode/php_unicode.h
@@ -55,8 +55,8 @@ PHP_MINFO_FUNCTION(unicode);
#include "TSRM.h"
#endif
-PHP_FUNCTION(i18n_loc_get_default);
-PHP_FUNCTION(i18n_loc_set_default);
+PHP_FUNCTION(locale_get_default);
+PHP_FUNCTION(locale_set_default);
PHP_FUNCTION(collator_get_default);
PHP_FUNCTION(collator_create);
PHP_FUNCTION(collator_compare);
diff --git a/ext/unicode/unicode.c b/ext/unicode/unicode.c
index 146d6a7dc9..6ffe8f0a1d 100644
--- a/ext/unicode/unicode.c
+++ b/ext/unicode/unicode.c
@@ -233,9 +233,8 @@ PHP_FUNCTION(unicode_get_subst_char)
/* {{{ unicode_functions[] */
zend_function_entry unicode_functions[] = {
- PHP_FE(i18n_loc_get_default, NULL)
- PHP_FE(i18n_loc_set_default, NULL)
- PHP_FE(collator_get_default, NULL)
+ PHP_FE(locale_get_default, NULL)
+ PHP_FE(locale_set_default, NULL)
PHP_FE(unicode_decode, NULL)
PHP_FE(unicode_semantics, NULL)
PHP_FE(unicode_encode, NULL)
@@ -245,6 +244,7 @@ zend_function_entry unicode_functions[] = {
PHP_FE(unicode_get_subst_char, NULL)
PHP_FE(collator_create, NULL)
PHP_FE(collator_compare, NULL)
+ PHP_FE(collator_get_default, NULL)
{ NULL, NULL, NULL }
};
/* }}} */