commit 0747ffb7a3ae4c31f7da16221ae8fe45bebcd2df
author Dan Albert <danalbert@google.com> Wed Jul 19 05:47:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 19 05:47:18 2017 +0000
tree 335bd0e5d109730a5033fca30f1dd985df17093e
parent e3c809f8636e2c12a4935c766b791afca6b63c4a
parent b2870803bac2832ad7aa832ad319fbc77c74655f

Merge "Add __RENAME_IF_FILE_OFFSET64." am: 0d6485eca4
am: b2870803ba

Change-Id: I7ff86b0bcb562d8aa50b330a66283f91dd181732

libc/include/sys/cdefs.h

diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index d62206d..307545c 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -235,10 +235,11 @@
 #endif
 
 /* _FILE_OFFSET_BITS 64 support. */
-#if !defined(__LP64__) && defined(_FILE_OFFSET_BITS)
-#if _FILE_OFFSET_BITS == 64
+#if !defined(__LP64__) && defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
 #define __USE_FILE_OFFSET64 1
-#endif
+#define __RENAME_IF_FILE_OFFSET64(func) __RENAME(func)
+#else
+#define __RENAME_IF_FILE_OFFSET64(func)
 #endif
 
 #define  __BIONIC__   1