wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-24 09:27:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #325 Part 2: Build ICUUtils unconditionally.

Browse source
This commit is contained in:
wolfbeast 2018-05-04 10:27:50 +02:00 • committed by Roy Tam
commit 6008e3c1f5
4 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
intl/unicharutil/util/ICUUtils.cpp
View file

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

4
intl/unicharutil/util/ICUUtils.h
View file

@ -6,9 +6,6 @@
#ifndef mozilla_ICUUtils_h__ #ifndef mozilla_ICUUtils_h__
#define 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 // The ICU utils implementation needs internal things like XPCOM strings and
// nsGkAtom, so we only build when included into internal libs: // nsGkAtom, so we only build when included into internal libs:
#ifdef MOZILLA_INTERNAL_API #ifdef MOZILLA_INTERNAL_API
@ -107,7 +104,6 @@ public:
#endif #endif
}; };
#endif /* ENABLE_INTL_API */
#endif /* MOZILLA_INTERNAL_API */ #endif /* MOZILLA_INTERNAL_API */
#endif /* mozilla_ICUUtils_h__ */ #endif /* mozilla_ICUUtils_h__ */

3
intl/unicharutil/util/moz.build
View file

@ -39,7 +39,6 @@ if CONFIG['_MSC_VER']:
CFLAGS += ['-Zl'] CFLAGS += ['-Zl']
CXXFLAGS += ['-Zl'] CXXFLAGS += ['-Zl']
if CONFIG['ENABLE_INTL_API']: USE_LIBS += ['icu']
USE_LIBS += ['icu']
DIST_INSTALL = True DIST_INSTALL = True

9
intl/unicharutil/util/objs.mozbuild
View file

@ -6,14 +6,7 @@
intl_unicharutil_util_lcppsrcs = [ intl_unicharutil_util_lcppsrcs = [
'GreekCasing.cpp', 'GreekCasing.cpp',
] 'ICUUtils.cpp',
if CONFIG['ENABLE_INTL_API']:
intl_unicharutil_util_lcppsrcs += [
'ICUUtils.cpp',
]
intl_unicharutil_util_lcppsrcs += [
'IrishCasing.cpp', 'IrishCasing.cpp',
'nsBidiUtils.cpp', 'nsBidiUtils.cpp',
'nsSpecialCasingData.cpp', 'nsSpecialCasingData.cpp',