]> Savannah Git Hosting - gnulib.git/commitdiff
fflush: Tweak last commit.
authorBruno Haible <bruno@clisp.org>
Tue, 17 Jan 2023 19:17:27 +0000 (20:17 +0100)
committerBruno Haible <bruno@clisp.org>
Fri, 20 Jan 2023 10:14:57 +0000 (11:14 +0100)
* lib/stdio-impl.h (fp_): Make the last change work also with newer
Android NDKs and _FILE_OFFSET_BITS=64.

ChangeLog
lib/stdio-impl.h

index 20d1170da4bade263f39528c9a86089dd52d3dfb..77619134abee59a95f0b537da245c461dc0fc6c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-17  Bruno Haible  <bruno@clisp.org>
+
+       fflush: Tweak last commit.
+       * lib/stdio-impl.h (fp_): Make the last change work also with newer
+       Android NDKs and _FILE_OFFSET_BITS=64.
+
 2023-01-17  Bruno Haible  <bruno@clisp.org>
 
        fflush: Fix a buffer overrun on 32-bit Android.
index 928b851617255fdf10ff6d8ba7ce7e2015989b74..c6aa0beb19be7a0a967f1b2ec89c8d4582a8d536 100644 (file)
 #   define _gl_flags_file_t int
 #  else
 #   define _gl_flags_file_t short
+#  endif
+#  ifdef __LP64__
+#   define _gl_file_offset_t int64_t
+#  else
+    /* see https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md */
+#   define _gl_file_offset_t __kernel_off_t
 #  endif
   /* Up to this commit from 2015-10-12
      <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
                          unsigned char _nbuf[1]; \
                          struct { unsigned char *_base; size_t _size; } _lb; \
                          int _blksize; \
-                         long _offset; \
+                         _gl_file_offset_t _offset; \
                          /* More fields, not relevant here.  */ \
                        } *) fp)
 # else