summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortarsin <yuanqingxiang233@163.com>2022-05-21 20:44:30 +0800
committertarsin <yuanqingxiang233@163.com>2022-05-21 20:44:30 +0800
commitcffd8ecd558afddc26c65d94fd3a494815b90202 (patch)
treeebe77699ecbbf71c31a046e787ac5a5d0e30b7a7
parentb1aa465b21fce2e4a0108360ba9b19e1e1aff02b (diff)
downloadlibarchive-cffd8ecd558afddc26c65d94fd3a494815b90202.tar.gz
Bionic c deprecates readdir_r too
* See https://android.googlesource.com/platform/bionic/+/f19af37b5ee6cd5283683195d692fe3f713db2a5
-rw-r--r--libarchive/archive_platform.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libarchive/archive_platform.h b/libarchive/archive_platform.h
index 3426975d..1038932a 100644
--- a/libarchive/archive_platform.h
+++ b/libarchive/archive_platform.h
@@ -195,8 +195,9 @@
/*
* glibc 2.24 deprecates readdir_r
+ * bionic c deprecates readdir_r too
*/
-#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24))
+#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) && (!defined(__ANDROID__))
#define USE_READDIR_R 1
#else
#undef USE_READDIR_R