Bug 901348 - Apply upstream ICU patch to fix OSX 10.9 build errors. r=Waldo
authorNomis101 <Nomis101@web.de>
Mon, 30 Sep 2013 21:04:15 +0200
changeset 164522 37e29c27e6e8bd66a4d29e4c065782761e6c5243
parent 164521 44024cc4a59f9ca19ad329a5aaa389f406c8b8ae
child 164523 14b7cbd254a8346025cbb130ca428180ff921c49
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo
bugs901348
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 901348 - Apply upstream ICU patch to fix OSX 10.9 build errors. r=Waldo
intl/icu-patches/bug-901348
intl/icu/source/common/umutex.h
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/bug-901348
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User Nomis101
+# Date 1380136873 -7200
+#      Wed Sep 25 21:21:13 2013 +0200
+# Node ID 2921e2256ba8a8ac1ca8b5b0e48eb04511545d41
+# Parent  39f30376058cf20823534f2d510430eaa31844bf
+Bug 901348 - [10.9] Duplicate symbol errors building --with-intl-api
+
+diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
+--- a/intl/icu/source/common/umutex.h
++++ b/intl/icu/source/common/umutex.h
+@@ -43,26 +43,18 @@
+ # define NOIME
+ # define NOMCX
+ # include <windows.h>
+ #endif  /* 0 */
+ #define U_WINDOWS_CRIT_SEC_SIZE 64
+ #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
+ 
+ /*
+  * If we do not compile with dynamic_annotations.h then define
+  * empty annotation macros.
+  *  See http://code.google.com/p/data-race-test/wiki/DynamicAnnotations
+  */
+ #ifndef ANNOTATE_HAPPENS_BEFORE
--- a/intl/icu/source/common/umutex.h
+++ b/intl/icu/source/common/umutex.h
@@ -43,26 +43,18 @@
 # define NOIME
 # define NOMCX
 # include <windows.h>
 #endif  /* 0 */
 #define U_WINDOWS_CRIT_SEC_SIZE 64
 #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
 
 /*
  * If we do not compile with dynamic_annotations.h then define
  * empty annotation macros.
  *  See http://code.google.com/p/data-race-test/wiki/DynamicAnnotations
  */
 #ifndef ANNOTATE_HAPPENS_BEFORE