diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-06-18 17:04:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-06-20 14:51:42 +0300 |
| commit | e79b6715070cdb4512d8ead784103930ebe8b221 (patch) | |
| tree | 9e04463ddec0a75d9f24fb65ba9d040529287b46 /icu | |
| parent | 204867dbecc9058a39ba4b6bc97021ca5d04af59 (diff) | |
Stop defining "inline" as empty on OS X and iOS in icu
It causes problems on newer SDKs.
Change-Id: I6bdb1e50cb239d99b190460fdb11d5c684e92275
Diffstat (limited to 'icu')
| -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 1e5051167be7..ba47658b3f7f 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 @@ |