From d338dd689782d5d3f913927236626bc6d7b83ead Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sun, 29 Dec 2019 20:56:22 +0200 Subject: [PATCH] ndk-patches: do not hide _FILE_OFFSET_BITS=64 --- ndk-patches/sys-cdefs.h.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ndk-patches/sys-cdefs.h.patch b/ndk-patches/sys-cdefs.h.patch index 058e8ee18..cdefb0e7b 100644 --- a/ndk-patches/sys-cdefs.h.patch +++ b/ndk-patches/sys-cdefs.h.patch @@ -1,19 +1,6 @@ diff -uNr sysroot.orig/usr/include/sys/cdefs.h sysroot/usr/include/sys/cdefs.h --- sysroot.orig/usr/include/sys/cdefs.h 2019-02-12 16:12:24.000000000 +0000 +++ sysroot/usr/include/sys/cdefs.h 2019-03-20 13:27:29.977876824 +0000 -@@ -206,7 +206,11 @@ - * _FILE_OFFSET_BITS 64 support. - * See https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md - */ --#if !defined(__LP64__) && defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+/* Using _FILE_OFFSET_BITS=64 does not work well on Android -+ * and can cause problems when mixing libraries, which is why -+ * Termux hides away this unless TERMUX_EXPOSE_FILE_OFFSET64 -+ * is defined. */ -+#if !defined(__LP64__) && defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(TERMUX_EXPOSE_FILE_OFFSET64) - # define __USE_FILE_OFFSET64 1 - /* - * Note that __RENAME_IF_FILE_OFFSET64 is only valid if the off_t and off64_t @@ -336,3 +340,6 @@ #include