Index: patches/mutex.patch |
diff --git a/patches/mutex.patch b/patches/mutex.patch |
index b4b5e2206e4961ec1b635627ab4432aec4002de8..fe3259fee947fef02a2c2b1c400523563a3c7fcb 100644 |
--- a/patches/mutex.patch |
+++ b/patches/mutex.patch |
@@ -1,5 +1,5 @@ |
diff --git a/source/common/putilimp.h b/source/common/putilimp.h |
-index e3da340..430e697 100644 |
+index e3da340..90bae92 100644 |
--- a/source/common/putilimp.h |
+++ b/source/common/putilimp.h |
@@ -1,7 +1,7 @@ |
@@ -11,7 +11,7 @@ index e3da340..430e697 100644 |
* Corporation and others. All Rights Reserved. |
* |
****************************************************************************** |
-@@ -229,6 +229,23 @@ typedef size_t uintptr_t; |
+@@ -229,6 +229,26 @@ typedef size_t uintptr_t; |
#endif |
@@ -22,15 +22,18 @@ index e3da340..430e697 100644 |
+ */ |
+#ifdef U_HAVE_CLANG_ATOMICS |
+ /* Use the predefined value. */ |
-+#elif defined(__clang__) && \ |
-+ __has_builtin(__c11_atomic_load) && \ |
-+ __has_builtin(__c11_atomic_store) && \ |
-+ __has_builtin(__c11_atomic_fetch_add) && \ |
-+ __has_builtin(__c11_atomic_fetch_sub) |
++#elif !defined(__clang__) |
++# define U_HAVE_CLANG_ATOMICS 0 |
++#else |
++#if __has_builtin(__c11_atomic_load) && \ |
++ __has_builtin(__c11_atomic_store) && \ |
++ __has_builtin(__c11_atomic_fetch_add) && \ |
++ __has_builtin(__c11_atomic_fetch_sub) |
+# define U_HAVE_CLANG_ATOMICS 1 |
+#else |
+# define U_HAVE_CLANG_ATOMICS 0 |
+#endif |
++#endif |
+ |
/*===========================================================================*/ |
/** @{ Code alignment */ |