From ec062a11fa897df3774ec58da21847ab57ad8e34 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 14 Nov 2024 05:18:00 +0100 Subject: [PATCH] ftello: Fix override on mingw. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported by Markus Mützel in . * lib/ftello.c: Test whether module 'largefile' is in use, not whether it had to override 'off_t'. --- ChangeLog | 8 ++++++++ lib/ftello.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2cb13075e1..671d025e30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-11-14 Bruno Haible + + ftello: Fix override on mingw. + Reported by Markus Mützel in + . + * lib/ftello.c: Test whether module 'largefile' is in use, not + whether it had to override 'off_t'. + 2024-11-14 Bruno Haible fseeko: Fix potentially wrong override. diff --git a/lib/ftello.c b/lib/ftello.c index 88247bca8e..37fe93a34e 100644 --- a/lib/ftello.c +++ b/lib/ftello.c @@ -34,7 +34,7 @@ ftello (FILE *fp) # undef ftell # define ftello ftell #endif -#if _GL_WINDOWS_64_BIT_OFF_T +#if (defined _WIN32 && !defined __CYGWIN__) && _FILE_OFFSET_BITS == 64 # undef ftello # if HAVE__FTELLI64 /* msvc, mingw64 */ # define ftello _ftelli64 -- 2.39.5