5 files changed, 13 insertions, 7 deletions

diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk
index 8e7fbdacefe9..2e9d9a399ad8 100644
--- a/contrib/android/Android.mk
+++ b/contrib/android/Android.mk
@@ -151,7 +151,7 @@ else
 libarchive_host_src_files :=
 endif
 
-libarchive_fe_src_files :=  libarchive_fe/err.c \
+libarchive_fe_src_files :=  libarchive_fe/lafe_err.c \
 							libarchive_fe/line_reader.c \
 							libarchive_fe/passphrase.c
 
diff --git a/contrib/android/config/android.h b/contrib/android/config/android.h
index 00fa4e9fdcfa..0a273be235b7 100644
--- a/contrib/android/config/android.h
+++ b/contrib/android/config/android.h
@@ -40,6 +40,8 @@
 
 #define HAVE_CHOWN 1
 #define HAVE_CHROOT 1
+#define HAVE_CLOSEFROM 1
+#define HAVE_CLOSE_RANGE 1
 #define HAVE_CTIME_R 1
 #define HAVE_CTYPE_H 1
 #define HAVE_DECL_EXTATTR_NAMESPACE_USER 0
diff --git a/contrib/android/config/linux_host.h b/contrib/android/config/linux_host.h
index f0f7ab39ca17..cc96e5efe3da 100644
--- a/contrib/android/config/linux_host.h
+++ b/contrib/android/config/linux_host.h
@@ -28,6 +28,8 @@
 
 #define HAVE_CHOWN 1
 #define HAVE_CHROOT 1
+#define HAVE_CLOSEFROM 1
+#define HAVE_CLOSE_RANGE 1
 #define HAVE_CTIME_R 1
 #define HAVE_CTYPE_H 1
 #define HAVE_DECL_EXTATTR_NAMESPACE_USER 0
@@ -180,7 +182,7 @@
 #define HAVE_WMEMCMP 1
 #define HAVE_WMEMCPY 1
 #define HAVE_ZLIB_H 1
-#define ICONV_CONST 
+#define ICONV_CONST
 #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 #define SIZEOF_WCHAR_T 4
 #define STDC_HEADERS 1
diff --git a/contrib/android/config/windows_host.h b/contrib/android/config/windows_host.h
index 4754744d8457..2e24be1d3d75 100644
--- a/contrib/android/config/windows_host.h
+++ b/contrib/android/config/windows_host.h
@@ -175,6 +175,12 @@
 /* Define to 1 if you have the `chroot' function. */
 /* #undef HAVE_CHROOT */
 
+/* Define to 1 if you have the `closefrom' function. */
+/* #undef HAVE_CLOSEFROM */
+
+/* Define to 1 if you have the `close_range' function. */
+/* #undef HAVE_CLOSE_RANGE */
+
 /* Define to 1 if you have the <copyfile.h> header file. */
 /* #undef HAVE_COPYFILE_H */
 
@@ -620,9 +626,6 @@
 /* Define to 1 if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */
 
-/* Define to 1 if you have a POSIX compatible readdir_r */
-#define HAVE_READDIR_R 1
-
 /* Define to 1 if you have the `readlink' function. */
 /* #undef HAVE_READLINK */
 
diff --git a/contrib/android/include/android_lf.h b/contrib/android/include/android_lf.h
index 3c5475e355a9..86d32e26bafb 100644
--- a/contrib/android/include/android_lf.h
+++ b/contrib/android/include/android_lf.h
@@ -1,4 +1,4 @@
-/* 

+/*

  * Macros for file64 functions

  *

  * Android does not support the macro _FILE_OFFSET_BITS=64

@@ -19,7 +19,6 @@
 #include <sys/vfs.h>

 

 //dirent.h

-#define readdir_r readdir64_r

 #define readdir readdir64

 #define dirent dirent64

 //fcntl.h