Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1198216 - Check for presence of ICU::Timezone::recreateDefault() before using. r=jwalden

Browse Source
This commit is contained in:
Ted Clancy 2015-08-27 07:57:19 -07:00
parent c94a10c345
commit 52fd2b978f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intl/icu-patches/bug-1172609-timezone-recreateDefault.diff
View File

@ -63,7 +63,7 @@ diff --git a/intl/icu/source/i18n/timezone.cpp b/intl/icu/source/i18n/timezone.c
diff --git a/intl/icu/source/i18n/unicode/timezone.h b/intl/icu/source/i18n/unicode/timezone.h
--- a/intl/icu/source/i18n/unicode/timezone.h
+++ b/intl/icu/source/i18n/unicode/timezone.h
@@ -299,16 +299,18 @@ public:
@@ -299,16 +299,19 @@ public:
* and made the default.
*
* @return A default TimeZone. Clients are responsible for deleting the time zone
@ -72,6 +72,7 @@ diff --git a/intl/icu/source/i18n/unicode/timezone.h b/intl/icu/source/i18n/unic
*/
static TimeZone* U_EXPORT2 createDefault(void);
+#define ICU_TZ_HAS_RECREATE_DEFAULT
+ static void U_EXPORT2 recreateDefault();
+
/**

1
intl/icu/source/i18n/unicode/timezone.h
View File

@ -304,6 +304,7 @@ public:
*/
static TimeZone* U_EXPORT2 createDefault(void);
#define ICU_TZ_HAS_RECREATE_DEFAULT
static void U_EXPORT2 recreateDefault();
/**

2
js/src/jsapi.cpp
View File

@ -6268,7 +6268,7 @@ JS::GetObjectZone(JSObject* obj)
JS_PUBLIC_API(void)
JS::ResetTimeZone()
{
#if ENABLE_INTL_API
#if ENABLE_INTL_API && defined(ICU_TZ_HAS_RECREATE_DEFAULT)
icu::TimeZone::recreateDefault();
#endif
}