X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/2173f7301d6332bbdb7c9c4d1aa25ddce6ff5964..7ee53f93d9d395caf9e29ac39443d19e5f40a8c1:/ndk-patches/sys-cdefs.h.patch

diff --git a/ndk-patches/sys-cdefs.h.patch b/ndk-patches/sys-cdefs.h.patch
index 3842b337..71645374 100644
--- a/ndk-patches/sys-cdefs.h.patch
+++ b/ndk-patches/sys-cdefs.h.patch
@@ -1,17 +1,16 @@
 diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/sys/cdefs.h ./usr/include/sys/cdefs.h
---- /home/fornwall/lib/android-ndk/sysroot/usr/include/sys/cdefs.h	2017-06-20 17:41:56.000000000 +0200
-+++ ./usr/include/sys/cdefs.h	2017-07-07 03:27:59.327850834 +0200
-@@ -234,13 +234,6 @@
- # define __USE_BSD 1
+--- /home/fornwall/lib/android-ndk/sysroot/usr/include/sys/cdefs.h	2017-07-21 11:04:10.000000000 +0200
++++ ./usr/include/sys/cdefs.h	2017-08-07 22:50:14.093361547 +0200
+@@ -235,7 +235,11 @@
  #endif
  
--/* _FILE_OFFSET_BITS 64 support. */
--#if !defined(__LP64__) && defined(_FILE_OFFSET_BITS)
--#if _FILE_OFFSET_BITS == 64
--#define __USE_FILE_OFFSET64 1
--#endif
--#endif
--
- #define  __BIONIC__   1
- #include <android/api-level.h>
- 
+ /* _FILE_OFFSET_BITS 64 support. */
+-#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
+ #define __RENAME_IF_FILE_OFFSET64(func) __RENAME(func)
+ #else