diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 12:08:48 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 15:50:01 +0200 |
| commit | a2652e5bc46b411f894d0a343f6ea6a83f07e3e2 (patch) | |
| tree | 0dc3797117bfb9a02f7f1615c46eebc9b717b3b6 /js/src/vm | |
| parent | 58751cc2ad952d73754fcf6bd894af865074ede6 (diff) | |
| download | UXP-a2652e5bc46b411f894d0a343f6ea6a83f07e3e2.tar UXP-a2652e5bc46b411f894d0a343f6ea6a83f07e3e2.tar.gz UXP-a2652e5bc46b411f894d0a343f6ea6a83f07e3e2.tar.lz UXP-a2652e5bc46b411f894d0a343f6ea6a83f07e3e2.tar.xz UXP-a2652e5bc46b411f894d0a343f6ea6a83f07e3e2.zip | |
Issue #325 Part 5: Remove non-Intl legacy code paths from js.
Diffstat (limited to 'js/src/vm')
| -rw-r--r-- | js/src/vm/DateTime.cpp | 6 | ||||
| -rw-r--r-- | js/src/vm/Initialization.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp index e35ad4285..ba3145af2 100644 --- a/js/src/vm/DateTime.cpp +++ b/js/src/vm/DateTime.cpp @@ -13,9 +13,7 @@ #include "jsutil.h" #include "js/Date.h" -#if ENABLE_INTL_API #include "unicode/timezone.h" -#endif using mozilla::Atomic; using mozilla::ReleaseAcquire; @@ -333,7 +331,7 @@ JS::ResetTimeZone() { js::DateTimeInfo::updateTimeZoneAdjustment(); -#if ENABLE_INTL_API && defined(ICU_TZ_HAS_RECREATE_DEFAULT) +#if defined(ICU_TZ_HAS_RECREATE_DEFAULT) TZInfo.acquire(); TZInfo.status = IcuTimeZoneInfo::NeedsUpdate; TZInfo.release(); @@ -343,7 +341,7 @@ JS::ResetTimeZone() void js::ResyncICUDefaultTimeZone() { -#if ENABLE_INTL_API && defined(ICU_TZ_HAS_RECREATE_DEFAULT) +#if defined(ICU_TZ_HAS_RECREATE_DEFAULT) TZInfo.acquire(); if (TZInfo.status == IcuTimeZoneInfo::NeedsUpdate) { icu::TimeZone::recreateDefault(); diff --git a/js/src/vm/Initialization.cpp b/js/src/vm/Initialization.cpp index 05cc087cc..b4108761f 100644 --- a/js/src/vm/Initialization.cpp +++ b/js/src/vm/Initialization.cpp @@ -20,10 +20,8 @@ #include "jit/ExecutableAllocator.h" #include "jit/Ion.h" #include "js/Utility.h" -#if ENABLE_INTL_API #include "unicode/uclean.h" #include "unicode/utypes.h" -#endif // ENABLE_INTL_API #include "vm/DateTime.h" #include "vm/HelperThreads.h" #include "vm/Runtime.h" |