summaryrefslogtreecommitdiff
path: root/ext/intl/locale/locale_methods.c
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2012-06-25 10:59:58 +0200
committerGustavo André dos Santos Lopes <cataphract@php.net>2012-06-25 10:59:58 +0200
commit9c5074a484b7f10e65471a21a7ef50dda8391509 (patch)
tree3f106a51663d8abca754f1dc77716e36b76116f7 /ext/intl/locale/locale_methods.c
parentee8b9d5c6f7390a56b277b170e2e3baee5c74bf4 (diff)
downloadphp-git-9c5074a484b7f10e65471a21a7ef50dda8391509.tar.gz
Fix undeclared intl_locale_get_default()
This was causing segfaults at least in the resourcebundle constructor. Also moved intl_locale_get_default() to a more central location and fixed a constness warning in resourcebundle_ctor().
Diffstat (limited to 'ext/intl/locale/locale_methods.c')
-rwxr-xr-xext/intl/locale/locale_methods.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index 466dba1f20..936e3142ad 100755
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -201,14 +201,6 @@ static int getSingletonPos(char* str)
}
/* }}} */
-const char *intl_locale_get_default( TSRMLS_D )
-{
- if( INTL_G(default_locale) == NULL ) {
- return uloc_getDefault();
- }
- return INTL_G(default_locale);
-}
-
/* {{{ proto static string Locale::getDefault( )
Get default locale */
/* }}} */