From ce9f5c3f48e6b7e8a2bda91a4cebbdd6f717067d Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Fri, 22 May 2015 11:50:55 +0200 Subject: [PATCH] Remove the InitializeStringResources function Now that the default string resources are embedded in the libcoreclr, it is no longer necessary to set the LC_MESSAGES locale to en_US in the PAL. --- src/pal/src/include/pal/locale.h | 2 -- src/pal/src/init/pal.cpp | 2 -- src/pal/src/locale/unicode.cpp | 16 ---------------- 3 files changed, 20 deletions(-) diff --git a/src/pal/src/include/pal/locale.h b/src/pal/src/include/pal/locale.h index 398a137..2a878f0 100644 --- a/src/pal/src/include/pal/locale.h +++ b/src/pal/src/include/pal/locale.h @@ -38,8 +38,6 @@ extern "C" #define ISO_NAME(region, encoding, part) region ".ISO" encoding "-" part #endif -void InitializeStringResources(void); - #if HAVE_COREFOUNDATION #define CF_EXCLUDE_CSTD_HEADERS #include diff --git a/src/pal/src/init/pal.cpp b/src/pal/src/init/pal.cpp index 37e7200..93b6c03 100644 --- a/src/pal/src/init/pal.cpp +++ b/src/pal/src/init/pal.cpp @@ -670,8 +670,6 @@ PAL_InitializeCoreCLR( return ERROR_DLL_INIT_FAILED; } - InitializeStringResources(); - if (!fStayInPAL) { PAL_Leave(PAL_BoundaryTop); diff --git a/src/pal/src/locale/unicode.cpp b/src/pal/src/locale/unicode.cpp index 6594b18..e9e150c 100644 --- a/src/pal/src/locale/unicode.cpp +++ b/src/pal/src/locale/unicode.cpp @@ -951,22 +951,6 @@ EXIT: return retval; } -/*++ - Function : - InitializeStringResources - - - Initialize the the native resources string support - --*/ -void InitializeStringResources(void) -{ -#ifndef __APPLE__ - // Set the locale for string resources to en_US - // UNIXTODO: After we add localized resources, change this to check the current - // locale and set it to en_US only if we don't have resources for the current locale. - setlocale(LC_MESSAGES, "en_US.UTF-8"); -#endif // __APPLE__ -} - extern char g_szCoreCLRPath[MAX_PATH]; /*++ -- 2.7.4