From: Manuel Klimek <klimek@google.com>
Date: Thu, 29 Oct 2015 17:29:55 +0000 (-0700)
Subject: Allow suppressing the definition of __USE_FILE_OFFSET64 by defining SUPPRESS_USE_FILE... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8254ee748c227f5921d28dd5fece73b20fde50f7;p=thirdparty%2Fglibc.git

Allow suppressing the definition of __USE_FILE_OFFSET64 by defining SUPPRESS_USE_FILE_OFFSET64 in the CROSSTOOL.
---

diff --git a/include/features.h b/include/features.h
index b68915a27a5..0748c81d319 100644
--- a/include/features.h
+++ b/include/features.h
@@ -360,7 +360,9 @@
 # define __USE_LARGEFILE64	1
 #endif
 
-#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64
+/* Google local: Add a way to disable the auto-64-bit-offset option for functions like
+   fgetpos, which can cause mismatched signatures in C++ modules.  */
+#if !(defined SUPPRESS_USE_FILE_OFFSET64) && defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64
 # define __USE_FILE_OFFSET64	1
 #endif