diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-06-18 17:04:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-02-10 11:41:17 +0200 |
| commit | 00ff1b319bfe05be78afa51dd01a06951ae02ac9 (patch) | |
| tree | 8cc8048d3096c8f7ef9f8bb311a4b12490a8832f | |
| parent | d242e4d89d50beea87f3e7cea94bb34dcf4e3d1e (diff) | |
Stop defining "inline" as empty on OS X and iOS in icu
It causes problems on newer SDKs.
Change-Id: I6bdb1e50cb239d99b190460fdb11d5c684e92275
| -rw-r--r-- | icu/icu4c-build.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 30ba3ad52cc4..4e5d6d99693c 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -1,3 +1,22 @@ +--- misc/icu/source/common/umutex.h ++++ misc/icu/source/common/umutex.h +@@ -48,16 +48,8 @@ + #endif /* win32 */ + + #if U_PLATFORM_IS_DARWIN_BASED +-#if defined(__STRICT_ANSI__) +-#define UPRV_REMAP_INLINE +-#define inline +-#endif + #include <libkern/OSAtomic.h> + #define USE_MAC_OS_ATOMIC_INCREMENT 1 +-#if defined(UPRV_REMAP_INLINE) +-#undef inline +-#undef UPRV_REMAP_INLINE +-#endif + #endif + + /* --- misc/icu/source/tools/toolutil/pkg_genc.h +++ misc/build/icu/source/tools/toolutil/pkg_genc.h @@ -58,7 +58,7 @@ |