diff options
| author | Martin Matuška <martin@matuska.org> | 2022-06-19 08:33:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-19 08:33:03 +0200 |
| commit | b63340c3a4e22cc64308313ac3ed980b0c9d9520 (patch) | |
| tree | 8d6a5cc82e8e91a95794121da384e0c650a601a7 | |
| parent | 4351580ee9cca4a7a0df0e1324ed8beab508413d (diff) | |
| parent | cffd8ecd558afddc26c65d94fd3a494815b90202 (diff) | |
| download | libarchive-b63340c3a4e22cc64308313ac3ed980b0c9d9520.tar.gz | |
Merge pull request #1732 from asuka-mio/master
Bionic c deprecates readdir_r too
| -rw-r--r-- | libarchive/archive_platform.h | 3 |
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 |