Issue #2046 - Move builtin/Intl.* to builtin/intl/IntlObject.*

7 files changed, 7 insertions, 10 deletions

diff --git a/js/src/builtin/Intl.cpp b/js/src/builtin/intl/IntlObject.cpp
index 94ef824304..6bb57adf41 100644
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/intl/IntlObject.cpp
@@ -5,7 +5,7 @@
 
 /* Implementation of the Intl object and its non-constructor properties. */
 
-#include "builtin/Intl.h"
+#include "builtin/intl/IntlObject.h"
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
diff --git a/js/src/builtin/Intl.h b/js/src/builtin/intl/IntlObject.h
index 9ff3e74d76..1f0b26c545 100644
--- a/js/src/builtin/Intl.h
+++ b/js/src/builtin/intl/IntlObject.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef builtin_Intl_h
-#define builtin_Intl_h
+#ifndef builtin_intl_IntlObject_h
+#define builtin_intl_IntlObject_h
 
 #include "mozilla/Attributes.h"
 
@@ -97,4 +97,4 @@ intl_ComputeDisplayNames(JSContext* cx, unsigned argc, JS::Value* vp);
 
 } // namespace js
 
-#endif /* builtin_Intl_h */
+#endif /* builtin_intl_IntlObject_h */
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 2b660e2c11..bae1a06475 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -43,7 +43,6 @@
 
 #include "builtin/AtomicsObject.h"
 #include "builtin/Eval.h"
-#include "builtin/Intl.h"
 #include "builtin/MapObject.h"
 #include "builtin/Promise.h"
 #include "builtin/RegExp.h"
diff --git a/js/src/moz.build b/js/src/moz.build
index 333c82cd40..dcb80ec4fc 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -114,10 +114,10 @@ EXPORTS.js += [
 UNIFIED_SOURCES += [
     'builtin/AtomicsObject.cpp',
     'builtin/Eval.cpp',
-    'builtin/Intl.cpp',
     'builtin/intl/Collator.cpp',
     'builtin/intl/CommonFunctions.cpp',
     'builtin/intl/DateTimeFormat.cpp',
+    'builtin/intl/IntlObject.cpp',
     'builtin/intl/NumberFormat.cpp',
     'builtin/intl/PluralRules.cpp',
     'builtin/intl/RelativeTimeFormat.cpp',
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index 2c379eee89..85a001d6a3 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -16,7 +16,6 @@
 
 #include "builtin/AtomicsObject.h"
 #include "builtin/Eval.h"
-#include "builtin/Intl.h"
 #include "builtin/MapObject.h"
 #include "builtin/ModuleObject.h"
 #include "builtin/Object.h"
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 0fc6e859e7..8ad1b00623 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -25,7 +25,6 @@
 # include "wasm/WasmSignalHandlers.h"
 #endif
 #include "builtin/AtomicsObject.h"
-#include "builtin/Intl.h"
 #include "builtin/intl/SharedIntlData.h"
 #include "builtin/Promise.h"
 #include "ds/FixedSizeHash.h"
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 817450a8d8..73f2a0a291 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -22,9 +22,9 @@
 #include "jswrapper.h"
 #include "selfhosted.out.h"
 
-#include "builtin/Intl.h"
 #include "builtin/intl/Collator.h"
 #include "builtin/intl/DateTimeFormat.h"
+#include "builtin/intl/IntlObject.h"
 #include "builtin/intl/NumberFormat.h"
 #include "builtin/intl/PluralRules.h"
 #include "builtin/intl/RelativeTimeFormat.h"
@@ -2448,7 +2448,7 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_FOR_EACH_REFERENCE_TYPE_REPR(LOAD_AND_STORE_REFERENCE_FN_DECLS)
 #undef LOAD_AND_STORE_REFERENCE_FN_DECLS
 
-    // See builtin/Intl.h for descriptions of the intl_* functions.
+    // See builtin/intl/*.h for descriptions of the intl_* functions.
     JS_FN("intl_availableCalendars", intl_availableCalendars, 1,0),
     JS_FN("intl_availableCollations", intl_availableCollations, 1,0),
     JS_FN("intl_canonicalizeTimeZone", intl_canonicalizeTimeZone, 1,0),