Bug 1402273 - Build ICUUtils unconditionally, now that we no longer build without ENABLE_INTL_API on any platform. r=m_kato

intl/unicharutil/util/ICUUtils.cpp

@@ -3,7 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef MOZILLA_INTERNAL_API
-#ifdef ENABLE_INTL_API
 
 #include "ICUUtils.h"
 #include "mozilla/Preferences.h"
@@ -274,6 +273,5 @@ ICUUtils::ToICUString(nsAString& aMozString, UnicodeString& aICUString)
 }
 #endif
 
-#endif /* ENABLE_INTL_API */
 #endif /* MOZILLA_INTERNAL_API */
 

intl/unicharutil/util/ICUUtils.h

@@ -6,9 +6,6 @@
 #ifndef mozilla_ICUUtils_h__
 #define mozilla_ICUUtils_h__
 
-// We only build the ICU utils if we're building ICU:
-#ifdef ENABLE_INTL_API
-
 // The ICU utils implementation needs internal things like XPCOM strings and
 // nsGkAtom, so we only build when included into internal libs:
 #ifdef MOZILLA_INTERNAL_API
@@ -105,7 +102,6 @@ public:
 #endif
 };
 
-#endif /* ENABLE_INTL_API */
 #endif /* MOZILLA_INTERNAL_API */
 
 #endif /* mozilla_ICUUtils_h__ */

intl/unicharutil/util/moz.build

@@ -17,6 +17,7 @@ EXPORTS += [
 
 UNIFIED_SOURCES += [
     'GreekCasing.cpp',
+    'ICUUtils.cpp',
     'IrishCasing.cpp',
     'nsBidiUtils.cpp',
     'nsSpecialCasingData.cpp',
@@ -24,9 +25,4 @@ UNIFIED_SOURCES += [
     'nsUnicodeProperties.cpp',
 ]
 
-if CONFIG['ENABLE_INTL_API']:
-    UNIFIED_SOURCES += [
-        'ICUUtils.cpp',
-    ]
-
 FINAL_LIBRARY = 'xul'