masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 10:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update from Gnulib by running admin/merge-gnulib

Browse source
This commit is contained in:
Paul Eggert 2025-01-17 15:34:41 -08:00
parent 2a00bedeae
commit 9eefe7ccda
3 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/gnulib.mk.in
View file

@ -729,6 +729,8 @@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ALPHASORT = @HAVE_ALPHASORT@
HAVE_ATOLL = @HAVE_ATOLL@ HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BE_APP = @HAVE_BE_APP@ 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_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@ 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|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-e 's|@''HAVE_OFF64_T''@|$(HAVE_OFF64_T)|g' \ -e 's|@''HAVE_OFF64_T''@|$(HAVE_OFF64_T)|g' \
-e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|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 $(srcdir)/sys_types.in.h > $@-t
$(AM_V_at)mv $@-t $@ $(AM_V_at)mv $@-t $@
MOSTLYCLEANFILES += sys/types.h sys/types.h-t MOSTLYCLEANFILES += sys/types.h sys/types.h-t

16
lib/sys_types.in.h
View file

@ -117,6 +117,22 @@ typedef unsigned long long int rpl_ino_t;
# include <stddef.h> # include <stddef.h>
#endif #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 /* _@GUARD_PREFIX@_SYS_TYPES_H */ #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
#endif /* __need_XXX */ #endif /* __need_XXX */

10
m4/sys_types_h.m4
View file

@ -1,5 +1,5 @@
# sys_types_h.m4 # sys_types_h.m4
# serial 14 # serial 15
dnl Copyright (C) 2011-2025 Free Software Foundation, Inc. dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, 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 WINDOWS_STAT_INODES=0
]) ])
AC_SUBST([WINDOWS_STAT_INODES]) 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. # Initializes the default values for AC_SUBSTed shell variables.