From a2652e5bc46b411f894d0a343f6ea6a83f07e3e2 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Fri, 4 May 2018 12:08:48 +0200
Subject: Issue #325 Part 5: Remove non-Intl legacy code paths from js.

---
 js/src/vm/DateTime.cpp       | 6 ++----
 js/src/vm/Initialization.cpp | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'js/src/vm')

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"
-- 
cgit v1.2.3