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().

2 files changed, 0 insertions, 10 deletions

diff --git a/ext/intl/locale/locale.h b/ext/intl/locale/locale.h
index 0aaab4b5b5..f3859c7a2a 100755
--- a/ext/intl/locale/locale.h
+++ b/ext/intl/locale/locale.h
@@ -22,8 +22,6 @@
 #include <php.h>
 
 void locale_register_constants( INIT_FUNC_ARGS );
-
-const char *intl_locale_get_default( TSRMLS_D );
  
 #define OPTION_DEFAULT NULL
 #define LOC_LANG_TAG "language"
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 */
 /* }}} */