Skip to content

Commit 4d3ec9c

Browse files
committed
Update NDK 25 patch on CI for upstream change
1 parent d6b9865 commit 4d3ec9c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

swift-android-stdlib-ndk25-trunk.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ index 6a34bc4746a..bc4a02a6eed 100644
66
static inline int _swift_stdlib_memcmp(const void *s1, const void *s2,
77
__swift_size_t n) {
88
// FIXME: Is there a way to identify Glibc specifically?
9-
-#if defined(__gnu_linux__) || defined(__ANDROID__) || defined(__musl__)
10-
+#if defined(__gnu_linux__) || defined(__musl__)
9+
-#if (defined(__gnu_linux__) || defined(__ANDROID__)) && !defined(__musl__)
10+
+#if defined(__gnu_linux__) && !defined(__musl__)
1111
extern int memcmp(const void * _Nonnull, const void * _Nonnull, __swift_size_t);
1212
#else
1313
extern int memcmp(const void * _Null_unspecified, const void * _Null_unspecified, __swift_size_t);

0 commit comments

Comments
 (0)