From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 21 May 2022 12:44:30 +0000 (+0800)
Subject: Bionic c deprecates readdir_r too
X-Git-Tag: v3.6.2~39^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1732%2Fhead;p=thirdparty%2Flibarchive.git

Bionic c deprecates readdir_r too

* See https://android.googlesource.com/platform/bionic/+/f19af37b5ee6cd5283683195d692fe3f713db2a5
---

diff --git a/libarchive/archive_platform.h b/libarchive/archive_platform.h
index 3426975de..1038932ac 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