Bug 1315986 followup - The static_assert to check Gecko vs ICU versions is only relevant when ENABLE_INTL_API is true. Bustage fix for Android on a CLOSED TREE.
authorJonathan Kew <jkew@mozilla.com>
Wed, 09 Nov 2016 16:14:58 +0000
changeset 351952 15f3c054b6a4b976359cbb741604aa57d812a9cd
parent 351951 310ae43d23b7392aad985af26c9907a598360b36
child 351953 1fd37c448b3f1fba260ee52caabecc60f5ce5e7a
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1315986
milestone52.0a1
Bug 1315986 followup - The static_assert to check Gecko vs ICU versions is only relevant when ENABLE_INTL_API is true. Bustage fix for Android on a CLOSED TREE.
intl/lwbrk/nsJISx4051LineBreaker.cpp
--- a/intl/lwbrk/nsJISx4051LineBreaker.cpp
+++ b/intl/lwbrk/nsJISx4051LineBreaker.cpp
@@ -548,18 +548,20 @@ GetClass(uint32_t u)
     /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
     /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
     /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
     /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
     /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
     /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER
   };
 
+#if ENABLE_INTL_API
   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
                 "Gecko vs ICU LineBreak class mismatch");
+#endif
 
   auto cls = mozilla::unicode::GetLineBreakClass(u);
   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
   return sUnicodeLineBreakToClass[cls];
 }
 
 static bool
 GetPair(int8_t c1, int8_t c2)