diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
| commit | 3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d (patch) | |
| tree | 2ef4b78c728a2e1a323babc75205b19911a5ffc0 /js/src/builtin/Intl.h | |
| parent | 175efcbab02bbfea84e565cdea9ee96d6436a08f (diff) | |
| parent | 2860601772b392f3f6d2977269f11061f4e970ee (diff) | |
| download | UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.gz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.lz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.xz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.zip | |
Merge branch 'intl-ICU-emoji-work'
Diffstat (limited to 'js/src/builtin/Intl.h')
| -rw-r--r-- | js/src/builtin/Intl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/js/src/builtin/Intl.h b/js/src/builtin/Intl.h index b2197060d..9a1e44913 100644 --- a/js/src/builtin/Intl.h +++ b/js/src/builtin/Intl.h @@ -16,9 +16,7 @@ #include "js/GCAPI.h" #include "js/GCHashTable.h" -#if ENABLE_INTL_API #include "unicode/utypes.h" -#endif /* * The Intl module specified by standard ECMA-402, @@ -429,7 +427,6 @@ intl_GetCalendarInfo(JSContext* cx, unsigned argc, Value* vp); extern MOZ_MUST_USE bool intl_ComputeDisplayNames(JSContext* cx, unsigned argc, Value* vp); -#if ENABLE_INTL_API /** * Cast char16_t* strings to UChar* strings used by ICU. */ @@ -456,7 +453,6 @@ UCharToChar16(const UChar* chars) { return reinterpret_cast<const char16_t*>(chars); } -#endif // ENABLE_INTL_API } // namespace js |