summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-04 10:27:50 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-04 10:27:50 +0200
commitcd1ab47cfd41fabae4fa41ae6bfd040caf8d806f (patch)
treecce50b00c006bb1c5d4a509bb7c19a61d408da16
parente6d4a8daf3497986d55bd4b4cfd85b11bc5684d1 (diff)
downloadUXP-cd1ab47cfd41fabae4fa41ae6bfd040caf8d806f.tar
UXP-cd1ab47cfd41fabae4fa41ae6bfd040caf8d806f.tar.gz
UXP-cd1ab47cfd41fabae4fa41ae6bfd040caf8d806f.tar.lz
UXP-cd1ab47cfd41fabae4fa41ae6bfd040caf8d806f.tar.xz
UXP-cd1ab47cfd41fabae4fa41ae6bfd040caf8d806f.zip
Issue #325 Part 2: Build ICUUtils unconditionally.
-rw-r--r--intl/unicharutil/util/ICUUtils.cpp2
-rw-r--r--intl/unicharutil/util/ICUUtils.h4
-rw-r--r--intl/unicharutil/util/moz.build3
-rw-r--r--intl/unicharutil/util/objs.mozbuild9
4 files changed, 2 insertions, 16 deletions
diff --git a/intl/unicharutil/util/ICUUtils.cpp b/intl/unicharutil/util/ICUUtils.cpp
index 2bb33d854..63d7cf453 100644
--- a/intl/unicharutil/util/ICUUtils.cpp
+++ b/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"
@@ -279,6 +278,5 @@ ICUUtils::ToICUString(nsAString& aMozString, UnicodeString& aICUString)
}
#endif
-#endif /* ENABLE_INTL_API */
#endif /* MOZILLA_INTERNAL_API */
diff --git a/intl/unicharutil/util/ICUUtils.h b/intl/unicharutil/util/ICUUtils.h
index 1fa8d4cc0..9f5fbd856 100644
--- a/intl/unicharutil/util/ICUUtils.h
+++ b/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
@@ -107,7 +104,6 @@ public:
#endif
};
-#endif /* ENABLE_INTL_API */
#endif /* MOZILLA_INTERNAL_API */
#endif /* mozilla_ICUUtils_h__ */
diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
index 97547536b..02f50ab0e 100644
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -39,7 +39,6 @@ if CONFIG['_MSC_VER']:
CFLAGS += ['-Zl']
CXXFLAGS += ['-Zl']
-if CONFIG['ENABLE_INTL_API']:
- USE_LIBS += ['icu']
+USE_LIBS += ['icu']
DIST_INSTALL = True
diff --git a/intl/unicharutil/util/objs.mozbuild b/intl/unicharutil/util/objs.mozbuild
index de9de37a7..448168473 100644
--- a/intl/unicharutil/util/objs.mozbuild
+++ b/intl/unicharutil/util/objs.mozbuild
@@ -6,14 +6,7 @@
intl_unicharutil_util_lcppsrcs = [
'GreekCasing.cpp',
-]
-
-if CONFIG['ENABLE_INTL_API']:
- intl_unicharutil_util_lcppsrcs += [
- 'ICUUtils.cpp',
- ]
-
-intl_unicharutil_util_lcppsrcs += [
+ 'ICUUtils.cpp',
'IrishCasing.cpp',
'nsBidiUtils.cpp',
'nsSpecialCasingData.cpp',