mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-11 10:18:21 +09:00
Merge pull request dotnet/coreclr#1042 from janvorli/remove-setlocale
Remove the InitializeStringResources function
Commit migrated from 300cc06e0c
This commit is contained in:
commit
39ed92ba67
3 changed files with 0 additions and 20 deletions
|
@ -38,8 +38,6 @@ extern "C"
|
||||||
#define ISO_NAME(region, encoding, part) region ".ISO" encoding "-" part
|
#define ISO_NAME(region, encoding, part) region ".ISO" encoding "-" part
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void InitializeStringResources(void);
|
|
||||||
|
|
||||||
#if HAVE_COREFOUNDATION
|
#if HAVE_COREFOUNDATION
|
||||||
#define CF_EXCLUDE_CSTD_HEADERS
|
#define CF_EXCLUDE_CSTD_HEADERS
|
||||||
#include <CoreFoundation/CoreFoundation.h>
|
#include <CoreFoundation/CoreFoundation.h>
|
||||||
|
|
|
@ -670,8 +670,6 @@ PAL_InitializeCoreCLR(
|
||||||
return ERROR_DLL_INIT_FAILED;
|
return ERROR_DLL_INIT_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
InitializeStringResources();
|
|
||||||
|
|
||||||
if (!fStayInPAL)
|
if (!fStayInPAL)
|
||||||
{
|
{
|
||||||
PAL_Leave(PAL_BoundaryTop);
|
PAL_Leave(PAL_BoundaryTop);
|
||||||
|
|
|
@ -951,22 +951,6 @@ EXIT:
|
||||||
return retval;
|
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];
|
extern char g_szCoreCLRPath[MAX_PATH];
|
||||||
|
|
||||||
/*++
|
/*++
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue