Skip to content

C
core
Kaydet (Commit) bf850f67 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Streamline a bit for Android 

Change-Id: I8233f6409d75bff23738e121efcdbd340035da9d
üst 4a11f5c2
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
sal/osl/unx/nlsupport.c
Dosyayı görüntüle @ bf850f67
...@@ -907,6 +907,12 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) ...@@ -907,6 +907,12 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
void _imp_getProcessLocale( rtl_Locale ** ppLocale ) void _imp_getProcessLocale( rtl_Locale ** ppLocale )
{ {
#ifdef ANDROID
/* No locale environment variables on Android, so why even bother
* with getenv().
*/
locale = "en-US.UTF-8";
#else
/* simulate behavior off setlocale */ /* simulate behavior off setlocale */
char * locale = getenv( "LC_ALL" ); char * locale = getenv( "LC_ALL" );
...@@ -917,13 +923,10 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) ...@@ -917,13 +923,10 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
locale = getenv( "LANG" ); locale = getenv( "LANG" );
if( NULL == locale ) if( NULL == locale )
#ifdef ANDROID
locale = "en-US.UTF-8";
#else
locale = "C"; locale = "C";
#endif
*ppLocale = _parse_locale( locale ); *ppLocale = _parse_locale( locale );
#endif
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment