summaryrefslogtreecommitdiffstats
path: root/js/src/shell
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-04 12:08:48 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-04 15:50:01 +0200
commita2652e5bc46b411f894d0a343f6ea6a83f07e3e2 (patch)
tree0dc3797117bfb9a02f7f1615c46eebc9b717b3b6 /js/src/shell
parent58751cc2ad952d73754fcf6bd894af865074ede6 (diff)
downloadUXP-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/shell')
-rw-r--r--js/src/shell/js.cpp4
-rw-r--r--js/src/shell/moz.build2
2 files changed, 1 insertions, 5 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 8d69ca942..8d144417a 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -893,7 +893,6 @@ SetPromiseRejectionTrackerCallback(JSContext* cx, unsigned argc, Value* vp)
return true;
}
-#ifdef ENABLE_INTL_API
static bool
AddIntlExtras(JSContext* cx, unsigned argc, Value* vp)
{
@@ -916,7 +915,6 @@ AddIntlExtras(JSContext* cx, unsigned argc, Value* vp)
args.rval().setUndefined();
return true;
}
-#endif // ENABLE_INTL_API
static bool
EvalAndPrint(JSContext* cx, const char* bytes, size_t length,
@@ -6140,7 +6138,6 @@ static const JSFunctionSpecWithHelp shell_functions[] = {
"Sets the callback to be invoked whenever a Promise rejection is unhandled\n"
"or a previously-unhandled rejection becomes handled."),
-#ifdef ENABLE_INTL_API
JS_FN_HELP("addIntlExtras", AddIntlExtras, 1, 0,
"addIntlExtras(obj)",
"Adds various not-yet-standardized Intl functions as properties on the\n"
@@ -6148,7 +6145,6 @@ static const JSFunctionSpecWithHelp shell_functions[] = {
"functions and their behavior are experimental: don't depend upon them\n"
"unless you're willing to update your code if these experimental APIs change\n"
"underneath you."),
-#endif // ENABLE_INTL_API
JS_FS_HELP_END
};
diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
index 72ea8145c..e18bad238 100644
--- a/js/src/shell/moz.build
+++ b/js/src/shell/moz.build
@@ -36,7 +36,7 @@ LOCAL_INCLUDES += [
OS_LIBS += CONFIG['EDITLINE_LIBS']
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
-if CONFIG['ENABLE_INTL_API'] and CONFIG['MOZ_ICU_DATA_ARCHIVE']:
+if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
# The ICU libraries linked into libmozjs will not include the ICU data,
# so link it directly.
USE_LIBS += ['icudata']