Skip to content

Commit 25cc3e4

Browse files
committed
libdispatch: update patch for upstream changes
1 parent 95686cc commit 25cc3e4

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

patches/libdispatch-fix-atomic.patch

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ https://github.com/android/ndk/issues/1177
55
https://github.com/android/ndk/issues/1178
66

77
diff --git a/src/shims/atomic.h b/src/shims/atomic.h
8-
index c002e72..11fc485 100644
8+
index bc232f1..d2e6921 100644
99
--- a/src/shims/atomic.h
1010
+++ b/src/shims/atomic.h
11-
@@ -35,7 +35,11 @@
11+
@@ -35,7 +35,7 @@
1212
#if defined(__cplusplus)
1313
#define _Bool bool
1414
#endif
15-
+#if defined(ANDROID) && __has_include(<bits/stdatomic.h>)
16-
+#include <bits/stdatomic.h>
17-
+#else
15+
-#if defined(__ANDROID__) && __NDK_MAJOR__ >= 23
16+
+#if defined(__ANDROID__) && __has_include(<bits/stdatomic.h>)
17+
#include <bits/stdatomic.h>
18+
#else
1819
#include <stdatomic.h>
19-
+#endif
20-
21-
#define memory_order_ordered memory_order_seq_cst
22-
#define memory_order_dependency memory_order_acquire

0 commit comments

Comments
 (0)