diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-18 15:17:42 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-12-18 15:17:42 -0800 |
| commit | 98593a66af3587efb653e16b8baccf4418b712c6 (patch) | |
| tree | ca3a3c10c8cc962111febb3f9821b5b9e56842c8 /core/combo/include | |
| parent | 3fc636c25af0ddcce6ebe6f99a1d7ca83b84f69a (diff) | |
| download | build-98593a66af3587efb653e16b8baccf4418b712c6.zip build-98593a66af3587efb653e16b8baccf4418b712c6.tar.gz build-98593a66af3587efb653e16b8baccf4418b712c6.tar.bz2 | |
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
Diffstat (limited to 'core/combo/include')
| -rw-r--r-- | core/combo/include/arch/linux-aarch64/AndroidConfig.h | 2 | ||||
| -rw-r--r-- | 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 77c8912..d649b2e 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 aaaf0c9..25a1f5d 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) |