gecko-dev/intl/icu-patches/bug-901348

39 строки
1.0 KiB
Plaintext

# 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