Bug 1198216 - Check for presence of ICU::Timezone::recreateDefault() …

…before using. r=jwalden
dothq · Aug 27, 2015 · 52fd2b9 · 52fd2b9
1 parent c94a10c
commit 52fd2b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/intl/icu-patches/bug-1172609-timezone-recreateDefault.diff b/intl/icu-patches/bug-1172609-timezone-recreateDefault.diff
@@ -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();
 +
      /**

diff --git a/intl/icu/source/i18n/unicode/timezone.h b/intl/icu/source/i18n/unicode/timezone.h
@@ -304,6 +304,7 @@ class U_I18N_API TimeZone : public UObject {
      */
     static TimeZone* U_EXPORT2 createDefault(void);
 
+#define ICU_TZ_HAS_RECREATE_DEFAULT
     static void U_EXPORT2 recreateDefault();
 
     /**

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
@@ -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
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -304,6 +304,7 @@ class U_I18N_API TimeZone : public UObject { @@
          */
         static TimeZone* U_EXPORT2 createDefault(void);
+    #define ICU_TZ_HAS_RECREATE_DEFAULT
         static void U_EXPORT2 recreateDefault();
         /**
@@ Expand Down @@