Update from Gnulib by running admin/merge-gnulib

3 files changed, 29 insertions, 1 deletions

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index ce874048f4a..7548df9d636 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -729,6 +729,8 @@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
 HAVE_ALPHASORT = @HAVE_ALPHASORT@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BE_APP = @HAVE_BE_APP@
+HAVE_BLKCNT_T = @HAVE_BLKCNT_T@
+HAVE_BLKSIZE_T = @HAVE_BLKSIZE_T@
 HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
@@ -3993,6 +3995,8 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status
               -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
               -e 's|@''HAVE_OFF64_T''@|$(HAVE_OFF64_T)|g' \
               -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
+              -e 's|@''HAVE_BLKSIZE_T''@|$(HAVE_BLKSIZE_T)|g' \
+              -e 's|@''HAVE_BLKCNT_T''@|$(HAVE_BLKCNT_T)|g' \
               $(srcdir)/sys_types.in.h > $@-t
         $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/types.h sys/types.h-t
diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h
index ed9e9506a10..acf9b2f7546 100644
--- a/lib/sys_types.in.h
+++ b/lib/sys_types.in.h
@@ -117,6 +117,22 @@ typedef unsigned long long int rpl_ino_t;
 # include <stddef.h>
 #endif
 
+/* Define blksize_t, required by POSIX:2024.  */
+#if !@HAVE_BLKSIZE_T@
+# if !defined GNULIB_defined_blksize_t
+typedef int blksize_t;
+#  define GNULIB_defined_blksize_t 1
+# endif
+#endif
+
+/* Define blkcnt_t, required by POSIX:2024.  */
+#if !@HAVE_BLKCNT_T@
+# if !defined GNULIB_defined_blkcnt_t
+typedef long long blkcnt_t;
+#  define GNULIB_defined_blkcnt_t 1
+# endif
+#endif
+
 #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
 #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
 #endif /* __need_XXX */
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index e13de24a784..e99fdcc6c2f 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -1,5 +1,5 @@
 # sys_types_h.m4
-# serial 14
+# serial 15
 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -34,6 +34,14 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H],
     WINDOWS_STAT_INODES=0
   ])
   AC_SUBST([WINDOWS_STAT_INODES])
+
+  dnl Test whether the 'blksize_t' type is defined.
+  AC_CHECK_TYPE([blksize_t], [HAVE_BLKSIZE_T=1], [HAVE_BLKSIZE_T=0])
+  AC_SUBST([HAVE_BLKSIZE_T])
+
+  dnl Test whether the 'blkcnt_t' type is defined.
+  AC_CHECK_TYPE([blkcnt_t], [HAVE_BLKCNT_T=1], [HAVE_BLKCNT_T=0])
+  AC_SUBST([HAVE_BLKCNT_T])
 ])
 
 # Initializes the default values for AC_SUBSTed shell variables.