summaryrefslogtreecommitdiffstats
path: root/js/src/vm/Initialization.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-04 21:47:32 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-04 21:47:32 +0200
commit74c62cd3373e23fe77f509373f581c33872d813d (patch)
treef3b15accca8029bf07b0d20ba63d972cb4f9f739 /js/src/vm/Initialization.cpp
parentc18d9955df45be20537cc221dabebdae7d4fe744 (diff)
downloadUXP-74c62cd3373e23fe77f509373f581c33872d813d.tar
UXP-74c62cd3373e23fe77f509373f581c33872d813d.tar.gz
UXP-74c62cd3373e23fe77f509373f581c33872d813d.tar.lz
UXP-74c62cd3373e23fe77f509373f581c33872d813d.tar.xz
UXP-74c62cd3373e23fe77f509373f581c33872d813d.zip
Issue #325 Part 14: Remove EXPOSE_INTL_API conditionals.
Diffstat (limited to 'js/src/vm/Initialization.cpp')
-rw-r--r--js/src/vm/Initialization.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/js/src/vm/Initialization.cpp b/js/src/vm/Initialization.cpp
index b4108761f..39acdf9a8 100644
--- a/js/src/vm/Initialization.cpp
+++ b/js/src/vm/Initialization.cpp
@@ -111,12 +111,10 @@ JS::detail::InitWithFailureDiagnostic(bool isDebugBuild)
js::DateTimeInfo::init();
-#if EXPOSE_INTL_API
UErrorCode err = U_ZERO_ERROR;
u_init(&err);
if (U_FAILURE(err))
return "u_init() failed";
-#endif // EXPOSE_INTL_API
RETURN_IF_FAIL(js::CreateHelperThreadsState());
RETURN_IF_FAIL(FutexRuntime::initialize());
@@ -169,9 +167,7 @@ JS_ShutDown(void)
// to do it only when PRMJ_Now is eventually called.
PRMJ_NowShutdown();
-#if EXPOSE_INTL_API
u_cleanup();
-#endif // EXPOSE_INTL_API
if (!JSRuntime::hasLiveRuntimes())
js::jit::ReleaseProcessExecutableMemory();
@@ -186,11 +182,7 @@ JS_SetICUMemoryFunctions(JS_ICUAllocFn allocFn, JS_ICUReallocFn reallocFn, JS_IC
"must call JS_SetICUMemoryFunctions before any other JSAPI "
"operation (including JS_Init)");
-#if EXPOSE_INTL_API
UErrorCode status = U_ZERO_ERROR;
u_setMemoryFunctions(/* context = */ nullptr, allocFn, reallocFn, freeFn, &status);
return U_SUCCESS(status);
-#else
- return true;
-#endif
}