From 98593a66af3587efb653e16b8baccf4418b712c6 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 18 Dec 2013 15:17:42 -0800 Subject: [PATCH] Fix aarch64 and x86-64 AndroidConfig.h. _LARGEFILE_SOURCE should never be defined with bionic. _FILE_OFFSET_BITS should be 64 on 64-bit architectures. Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522 --- core/combo/include/arch/linux-aarch64/AndroidConfig.h | 2 +- core/combo/include/arch/target_linux-x86/AndroidConfig.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/combo/include/arch/linux-aarch64/AndroidConfig.h b/core/combo/include/arch/linux-aarch64/AndroidConfig.h index 77c891289..d649b2e62 100644 --- a/core/combo/include/arch/linux-aarch64/AndroidConfig.h +++ b/core/combo/include/arch/linux-aarch64/AndroidConfig.h @@ -166,7 +166,7 @@ #define HAVE_LITTLE_ENDIAN #define _FILE_OFFSET_BITS 64 -#define _LARGEFILE_SOURCE 1 +/* #define _LARGEFILE_SOURCE 1 */ /* * Define if platform has off64_t (and lseek64 and other xxx64 functions) diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index aaaf0c9bf..25a1f5d41 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -157,10 +157,10 @@ * agree on the same size. For desktop systems, use 64-bit values, * because some of our libraries (e.g. wxWidgets) expect to be built that way. */ -/* - * #define _FILE_OFFSET_BITS 64 - * #define _LARGEFILE_SOURCE 1 - */ +#if __LP64__ +#define _FILE_OFFSET_BITS 64 +#endif +/* #define _LARGEFILE_SOURCE 1 */ /* * Define if platform has off64_t (and lseek64 and other xxx64 functions)