Update from gnulib
This commit is contained in:
Paul Eggert
parent
67940394c0
commit
992cf3cb67
5 changed files with 72 additions and 45 deletions
|
|
@ -3,9 +3,9 @@
|
|||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{2022-01-02.12}
|
||||
\def\texinfoversion{2022-04-09.08}
|
||||
%
|
||||
% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
|
||||
% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
|
||||
%
|
||||
% This texinfo.tex file is free software: you can redistribute it and/or
|
||||
% modify it under the terms of the GNU General Public License as
|
||||
|
|
@ -3171,16 +3171,8 @@
|
|||
% Default is `distinct'.
|
||||
\kbdinputstyle distinct
|
||||
|
||||
% @kbd is like @code, except that if the argument is just one @key command,
|
||||
% then @kbd has no effect.
|
||||
\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
|
||||
|
||||
\def\xkey{\key}
|
||||
\def\kbdsub#1#2#3\par{%
|
||||
\def\one{#1}\def\three{#3}\def\threex{??}%
|
||||
\ifx\one\xkey\ifx\threex\three \key{#2}%
|
||||
\else{\tclose{\kbdfont\setcodequotes\look}}\fi
|
||||
\else{\tclose{\kbdfont\setcodequotes\look}}\fi
|
||||
\def\kbd#1{%
|
||||
\tclose{\kbdfont\setcodequotes#1}%
|
||||
}
|
||||
|
||||
% definition of @key that produces a lozenge. Doesn't adjust to text size.
|
||||
|
|
@ -4417,7 +4409,7 @@
|
|||
% Find the correct column width
|
||||
\hsize=\expandafter\csname col\the\colcount\endcsname
|
||||
%
|
||||
\rightskip=0pt
|
||||
\advance\rightskip by -1\rightskip % Zero leaving only any stretch
|
||||
\ifnum\colcount=1
|
||||
\advance\hsize by\leftskip % Add indent of surrounding text
|
||||
\else
|
||||
|
|
@ -5961,7 +5953,7 @@
|
|||
% Chapters, sections, etc.
|
||||
|
||||
% Let's start with @part.
|
||||
\outer\parseargdef\part{\partzzz{#1}}
|
||||
\parseargdef\part{\partzzz{#1}}
|
||||
\def\partzzz#1{%
|
||||
\chapoddpage
|
||||
\null
|
||||
|
|
@ -8680,9 +8672,11 @@
|
|||
}
|
||||
\def\wordTop{Top}
|
||||
|
||||
% Until the next @node or @bye command, divert output to a box that is not
|
||||
% output.
|
||||
\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}%
|
||||
% Until the next @node, @part or @bye command, divert output to a box that
|
||||
% is not output.
|
||||
\def\ignorenode{\setbox\dummybox\vbox\bgroup
|
||||
\def\part{\egroup\part}%
|
||||
\def\node{\egroup\node}%
|
||||
\ignorenodebye
|
||||
}
|
||||
|
||||
|
|
@ -9391,13 +9385,12 @@
|
|||
\catcode`\^^M = 5 % in case we're inside an example
|
||||
\normalturnoffactive % allow _ et al. in names
|
||||
\makevalueexpandable
|
||||
% If the image is by itself, center it.
|
||||
\ifvmode
|
||||
\imagevmodetrue
|
||||
\else \ifx\centersub\centerV
|
||||
% for @center @image, we need a vbox so we can have our vertical space
|
||||
\imagevmodetrue
|
||||
\vbox\bgroup % vbox has better behavior than vtop herev
|
||||
\vbox\bgroup % vbox has better behavior than vtop here
|
||||
\fi\fi
|
||||
%
|
||||
\ifimagevmode
|
||||
|
|
@ -9405,11 +9398,14 @@
|
|||
% Usually we'll have text after the image which will insert
|
||||
% \parskip glue, so insert it here too to equalize the space
|
||||
% above and below.
|
||||
\nobreak\vskip\parskip
|
||||
\nobreak
|
||||
\vskip\parskip
|
||||
%
|
||||
% Place image in a \vtop for a top page margin that is (close to) correct,
|
||||
% as \topskip glue is relative to the first baseline.
|
||||
\vtop\bgroup\hrule height 0pt\vskip-\parskip
|
||||
\fi
|
||||
%
|
||||
% Leave vertical mode so that indentation from an enclosing
|
||||
% Enter horizontal mode so that indentation from an enclosing
|
||||
% environment such as @quotation is respected.
|
||||
% However, if we're at the top level, we don't want the
|
||||
% normal paragraph indentation.
|
||||
|
|
@ -9438,6 +9434,7 @@
|
|||
\fi
|
||||
%
|
||||
\ifimagevmode
|
||||
\egroup
|
||||
\medskip % space after a standalone image
|
||||
\fi
|
||||
\ifx\centersub\centerV \egroup \fi
|
||||
|
|
@ -10898,6 +10895,9 @@
|
|||
\DeclareUnicodeCharacter{1EF8}{\~Y}%
|
||||
\DeclareUnicodeCharacter{1EF9}{\~y}%
|
||||
%
|
||||
% Exotic spaces
|
||||
\DeclareUnicodeCharacter{2007}{\hphantom{0}}%
|
||||
%
|
||||
% Punctuation
|
||||
\DeclareUnicodeCharacter{2013}{--}%
|
||||
\DeclareUnicodeCharacter{2014}{---}%
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ see https://www.gnu.org/licenses/. */
|
|||
#define gmp_assert_nocarry(x) do { \
|
||||
mp_limb_t __cy = (x); \
|
||||
assert (__cy == 0); \
|
||||
(void) (__cy); \
|
||||
} while (0)
|
||||
|
||||
#define gmp_clz(count, x) do { \
|
||||
|
|
|
|||
|
|
@ -125,14 +125,22 @@ _GL_EXTERN_C void rpl_free (void *);
|
|||
# if defined _MSC_VER
|
||||
_GL_EXTERN_C void __cdecl free (void *);
|
||||
# else
|
||||
# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
|
||||
_GL_EXTERN_C void free (void *) throw ();
|
||||
# else
|
||||
_GL_EXTERN_C void free (void *);
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
#else
|
||||
# if defined _MSC_VER
|
||||
_GL_EXTERN_C void __cdecl free (void *);
|
||||
# else
|
||||
# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
|
||||
_GL_EXTERN_C void free (void *) throw ();
|
||||
# else
|
||||
_GL_EXTERN_C void free (void *);
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
@ -230,10 +238,11 @@ _GL_CXXALIAS_SYS_CAST2 (memchr,
|
|||
void const *, (void const *__s, int __c, size_t __n));
|
||||
# endif
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n));
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
|
||||
|| defined __clang__)
|
||||
_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ());
|
||||
_GL_CXXALIASWARN1 (memchr, void const *,
|
||||
(void const *__s, int __c, size_t __n));
|
||||
(void const *__s, int __c, size_t __n) throw ());
|
||||
# elif __GLIBC__ >= 2
|
||||
_GL_CXXALIASWARN (memchr);
|
||||
# endif
|
||||
|
|
@ -315,9 +324,10 @@ _GL_CXXALIAS_SYS_CAST2 (memrchr,
|
|||
void *, (void const *, int, size_t),
|
||||
void const *, (void const *, int, size_t));
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t));
|
||||
_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t));
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
|
||||
|| defined __clang__)
|
||||
_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ());
|
||||
_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ());
|
||||
# else
|
||||
_GL_CXXALIASWARN (memrchr);
|
||||
# endif
|
||||
|
|
@ -345,9 +355,11 @@ _GL_CXXALIAS_SYS_CAST2 (rawmemchr,
|
|||
void *, (void const *__s, int __c_in),
|
||||
void const *, (void const *__s, int __c_in));
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in));
|
||||
_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in));
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
|
||||
|| defined __clang__)
|
||||
_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ());
|
||||
_GL_CXXALIASWARN1 (rawmemchr, void const *,
|
||||
(void const *__s, int __c_in) throw ());
|
||||
# else
|
||||
_GL_CXXALIASWARN (rawmemchr);
|
||||
# endif
|
||||
|
|
@ -449,9 +461,11 @@ _GL_CXXALIAS_SYS_CAST2 (strchrnul,
|
|||
char const *, (char const *__s, int __c_in));
|
||||
# endif
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in));
|
||||
_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in));
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
|
||||
|| defined __clang__)
|
||||
_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ());
|
||||
_GL_CXXALIASWARN1 (strchrnul, char const *,
|
||||
(char const *__s, int __c_in) throw ());
|
||||
# else
|
||||
_GL_CXXALIASWARN (strchrnul);
|
||||
# endif
|
||||
|
|
@ -651,10 +665,11 @@ _GL_CXXALIAS_SYS_CAST2 (strpbrk,
|
|||
char *, (char const *__s, char const *__accept),
|
||||
const char *, (char const *__s, char const *__accept));
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept));
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
|
||||
|| defined __clang__)
|
||||
_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ());
|
||||
_GL_CXXALIASWARN1 (strpbrk, char const *,
|
||||
(char const *__s, char const *__accept));
|
||||
(char const *__s, char const *__accept) throw ());
|
||||
# elif __GLIBC__ >= 2
|
||||
_GL_CXXALIASWARN (strpbrk);
|
||||
# endif
|
||||
|
|
@ -759,10 +774,12 @@ _GL_CXXALIAS_SYS_CAST2 (strstr,
|
|||
const char *, (const char *haystack, const char *needle));
|
||||
# endif
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle));
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
|
||||
|| defined __clang__)
|
||||
_GL_CXXALIASWARN1 (strstr, char *,
|
||||
(char *haystack, const char *needle) throw ());
|
||||
_GL_CXXALIASWARN1 (strstr, const char *,
|
||||
(const char *haystack, const char *needle));
|
||||
(const char *haystack, const char *needle) throw ());
|
||||
# elif __GLIBC__ >= 2
|
||||
_GL_CXXALIASWARN (strstr);
|
||||
# endif
|
||||
|
|
@ -808,10 +825,12 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr,
|
|||
const char *, (const char *haystack, const char *needle));
|
||||
# endif
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle));
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
|
||||
|| defined __clang__)
|
||||
_GL_CXXALIASWARN1 (strcasestr, char *,
|
||||
(char *haystack, const char *needle) throw ());
|
||||
_GL_CXXALIASWARN1 (strcasestr, const char *,
|
||||
(const char *haystack, const char *needle));
|
||||
(const char *haystack, const char *needle) throw ());
|
||||
# else
|
||||
_GL_CXXALIASWARN (strcasestr);
|
||||
# endif
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#ifndef __cplusplus
|
||||
# if (201112L <= __STDC_VERSION__ \
|
||||
|| (!defined __STRICT_ANSI__ \
|
||||
&& (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 4 <= __clang_major__)))
|
||||
&& (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 5 <= __clang_major__)))
|
||||
# define _GL_HAVE__STATIC_ASSERT 1
|
||||
# endif
|
||||
# if (202000L <= __STDC_VERSION__ \
|
||||
|
|
@ -215,6 +215,9 @@ template <int w>
|
|||
# define _GL_VERIFY(R, DIAGNOSTIC, ...) \
|
||||
extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
|
||||
[_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
|
||||
# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
|
||||
# pragma GCC diagnostic ignored "-Wnested-externs"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# gnulib-common.m4 serial 72
|
||||
# gnulib-common.m4 serial 73
|
||||
dnl Copyright (C) 2007-2022 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -106,6 +106,10 @@ AC_DEFUN([gl_COMMON_BODY], [
|
|||
#endif
|
||||
|
||||
#ifdef __has_c_attribute
|
||||
# if ((defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710 \
|
||||
&& _GL_GNUC_PREREQ (4, 6))
|
||||
# pragma GCC diagnostic ignored "-Wpedantic"
|
||||
# endif
|
||||
# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__)
|
||||
#else
|
||||
# define _GL_HAS_C_ATTRIBUTE(attr) 0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue