From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7814) id 04ACC3857C7E; Sat, 28 Aug 2021 00:41:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04ACC3857C7E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Fangrui Song To: glibc-cvs@sourceware.org Subject: [glibc/google/grte/v5-2.27/master] Allow suppressing the definition of __USE_FILE_OFFSET64 by defining SUPPRESS_USE_FILE_OFFSET64 in th X-Act-Checkin: glibc X-Git-Author: Manuel Klimek X-Git-Refname: refs/heads/google/grte/v5-2.27/master X-Git-Oldrev: 8205f0d10ebb5ddf8c43e8cede4a86f7744a0504 X-Git-Newrev: 8254ee748c227f5921d28dd5fece73b20fde50f7 Message-Id: <20210828004144.04ACC3857C7E@sourceware.org> Date: Sat, 28 Aug 2021 00:41:44 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2021 00:41:44 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8254ee748c227f5921d28dd5fece73b20fde50f7 commit 8254ee748c227f5921d28dd5fece73b20fde50f7 Author: Manuel Klimek Date: Thu Oct 29 10:29:55 2015 -0700 Allow suppressing the definition of __USE_FILE_OFFSET64 by defining SUPPRESS_USE_FILE_OFFSET64 in the CROSSTOOL. Diff: --- include/features.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/features.h b/include/features.h index b68915a27a..0748c81d31 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