File tree 2 files changed +8
-16
lines changed
Runtime/PlatformAgnostic/Platform/Windows
2 files changed +8
-16
lines changed Original file line number Diff line number Diff line change @@ -411,7 +411,12 @@ Js::CharClassifier::CharClassifier(void)
411
411
bool isES6UnicodeModeEnabled = CONFIG_FLAG (ES6Unicode);
412
412
bool isFullUnicodeSupportAvailable = PlatformAgnostic::UnicodeText::IsExternalUnicodeLibraryAvailable ();
413
413
414
- #if INTL_ICU || INTL_WINGLOB // don't assert in _no_icu builds (where there is no i18n library, by design)
414
+ // The following assertions are intentionally excluded from ChakraCore by guarding on NTBUILD.
415
+ // This is to work around limitations of the i18n library downlevel (Win7, Win 8.0)
416
+ // where CharClassifier functionality is not available.
417
+ // TODO: Ideally, we would use the following guard instead to assert when an i18n library is available:
418
+ // #if INTL_ICU || INTL_WINGLOB
419
+ #ifdef NTBUILD
415
420
AssertMsg (isFullUnicodeSupportAvailable, " Windows.Globalization needs to present with IUnicodeCharacterStatics support for Chakra.dll to work" );
416
421
if (!isFullUnicodeSupportAvailable)
417
422
{
@@ -450,6 +455,7 @@ Js::CharClassifier::CharClassifier(void)
450
455
getBigCharFlagsFunc = &CharClassifier::GetBigCharFlagsES5;
451
456
}
452
457
#endif
458
+
453
459
}
454
460
455
461
const OLECHAR* Js::CharClassifier::SkipWhiteSpaceNonSurrogate (LPCOLESTR psz, const CharClassifier *instance)
Original file line number Diff line number Diff line change @@ -416,23 +416,9 @@ namespace PlatformAgnostic
416
416
{
417
417
return true ;
418
418
}
419
- #if INTL_ICU || INTL_WINGLOB // don't assert in _no_icu builds (where there is no i18n library, by design)
420
- else
421
- {
422
- // did not find winGlobCharApi
423
- Js::Throw::FatalInternalGlobalizationError ();
424
- }
425
- }
426
- else
427
- {
428
- // failed to initialize Windows Globalization
429
- Js::Throw::FatalInternalGlobalizationError ();
430
- #endif
431
419
}
432
420
433
- #if (INTL_ICU || INTL_WINGLOB) && !defined(DBG)
434
- return false ; // in debug builds, this is unreachable code
435
- #endif
421
+ return false ;
436
422
}, false );
437
423
}
438
424
#endif // HAS_ICU
You can’t perform that action at this time.
0 commit comments