diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2016-08-23 11:23:19 -0700 |
|---|---|---|
| committer | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2016-08-23 16:06:09 -0700 |
| commit | 1153e4cefbee7d59a659344e709a3a223bb6aa87 (patch) | |
| tree | 0882276dff7e31bba04612d127c72e2accc02e75 /src/classlibnative/nls | |
| parent | c940bc816db970c4dcb3130f6e1a8f3a51d73328 (diff) | |
| download | coreclr-1153e4cefbee7d59a659344e709a3a223bb6aa87.tar.gz coreclr-1153e4cefbee7d59a659344e709a3a223bb6aa87.tar.bz2 coreclr-1153e4cefbee7d59a659344e709a3a223bb6aa87.zip | |
Enable more code under globalization for netcore
This fix is to enable the code handling LCID for Windows in globalization namespace
Diffstat (limited to 'src/classlibnative/nls')
| -rw-r--r-- | src/classlibnative/nls/nlsinfo.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/classlibnative/nls/nlsinfo.cpp b/src/classlibnative/nls/nlsinfo.cpp index babad228f6..da54a5b17b 100644 --- a/src/classlibnative/nls/nlsinfo.cpp +++ b/src/classlibnative/nls/nlsinfo.cpp @@ -796,7 +796,6 @@ BOOL COMNlsInfo::CallGetLocaleInfoEx(LPCWSTR localeName, int lcType, STRINGREF* return (result != 0); } -#ifdef FEATURE_USE_LCID FCIMPL1(Object*, COMNlsInfo::LCIDToLocaleName, LCID lcid) { FCALL_CONTRACT; @@ -849,7 +848,6 @@ FCIMPL1(INT32, COMNlsInfo::LocaleNameToLCID, StringObject* localeNameUNSAFE) return result; } FCIMPLEND -#endif // FEATURE_USE_LCID //////////////////////////////////////////////////////////////////////// // @@ -1007,10 +1005,8 @@ FCIMPL3(FC_BOOL_RET, COMNlsInfo::nativeGetNumberFormatInfoValues, _ASSERT(ret == TRUE); ret &= CallGetLocaleInfoEx(pLocaleName, LOCALE_INEGNUMBER| LOCALE_RETURN_NUMBER , &(gc.numfmt->cNegativeNumberFormat), useUserOverride); _ASSERT(ret == TRUE); -#ifndef FEATURE_CORECLR ret &= CallGetLocaleInfoEx(pLocaleName, LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, &(gc.numfmt->iDigitSubstitution), useUserOverride); _ASSERT(ret == TRUE); -#endif // LOCALE_SNATIVEDIGITS (gc.tempArray of strings) if (GetNativeDigitsFromWin32(pLocaleName, &gc.tempArray, useUserOverride)) { @@ -2880,10 +2876,8 @@ FCIMPL1(FC_BOOL_RET, COMNlsInfo::nativeInitCultureData, CultureDataBaseObject *c // Remember our neutrality gc.cultureData->bNeutral = (bNeutral != 0); -#ifndef FEATURE_CORECLR gc.cultureData->bWin32Installed = (IsOSValidLocaleName(buffer, gc.cultureData->bNeutral) != 0); gc.cultureData->bFramework = (IsWhidbeyFrameworkCulture(buffer) != 0); -#endif // FEATURE_CORECLR // Note: Parents will be set dynamically |