Skip to content

Commit 82b4fe7

Browse files
authored
Merge pull request #26079 from drodriguez/android-fix-cxx-interop-3
[android] Remove dependency from SwiftShims to Libc
2 parents 80372ed + c7d7115 commit 82b4fe7

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

stdlib/public/SwiftShims/LibcShims.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
#include "SwiftStddef.h"
2424
#include "Visibility.h"
2525

26-
#if defined(__ANDROID__)
27-
#include <android/api-level.h>
28-
#endif
29-
3026
#if __has_feature(nullability)
3127
#pragma clang assume_nonnull begin
3228
#endif
@@ -112,7 +108,7 @@ static inline __swift_size_t _swift_stdlib_malloc_size(const void *ptr) {
112108
|| defined(__HAIKU__) || defined(__FreeBSD__)
113109
static inline __swift_size_t _swift_stdlib_malloc_size(const void *ptr) {
114110
#if defined(__ANDROID__)
115-
#if __ANDROID_API__ >= 17
111+
#if !defined(__ANDROID_API__) || __ANDROID_API__ >= 17
116112
extern __swift_size_t malloc_usable_size(const void *ptr);
117113
#endif
118114
#else

0 commit comments

Comments
 (0)