From: Bruno Haible <bruno@clisp.org>
Date: Sat, 30 Sep 2023 18:46:04 +0000 (+0200)
Subject: intl: Merge from glibc.
X-Git-Tag: v0.23~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ca07cbc58bedbb8fbc857b7f878a3de12592b52;p=thirdparty%2Fgettext.git

intl: Merge from glibc.

Apply commit
2021-03-02  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Use 64 bit time_t stat internally
---

diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 3d6d653b9..7bb6a7309 100644
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -685,7 +685,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
   int fd = -1;
   size_t size;
 #ifdef _LIBC
-  struct stat64 st;
+  struct __stat64_t64 st;
 #else
   struct stat st;
 #endif
@@ -744,7 +744,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
   /* We must know about the size of the file.  */
   if (
 #ifdef _LIBC
-      __builtin_expect (__fstat64 (fd, &st) != 0, 0)
+      __glibc_unlikely (__fstat64_time64 (fd, &st) != 0)
 #else
       __builtin_expect (fstat (fd, &st) != 0, 0)
 #endif