From 27dae84ed92f1ef0300263091972338d12e78348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 18 Oct 2025 19:06:52 +0200 Subject: New upstream version 1.4.1 --- tests/ctype.in.h | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 279 insertions(+), 2 deletions(-) (limited to 'tests/ctype.in.h') diff --git a/tests/ctype.in.h b/tests/ctype.in.h index 61bcbf16..f0e62395 100644 --- a/tests/ctype.in.h +++ b/tests/ctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms on which it is incomplete. - Copyright (C) 2009-2024 Free Software Foundation, Inc. + Copyright (C) 2009-2025 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -29,6 +29,19 @@ #endif @PRAGMA_COLUMNS@ +/* On Solaris 11 OmniOS, we cannot include until after has + been entirely included. That is because + - includes , which makes use of the mbstate_t type. + - includes , which includes *before* + defining mbstate_t, WEOF, etc. */ +#if defined __sun && defined _ISO_WCHAR_ISO_H && !defined WEOF +/* We're in the middle of including . + Include just the original . */ + +#@INCLUDE_NEXT@ @NEXT_CTYPE_H@ + +#else + /* Include the original . */ /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_CTYPE_H@ @@ -36,15 +49,62 @@ #ifndef _@GUARD_PREFIX@_CTYPE_H #define _@GUARD_PREFIX@_CTYPE_H -/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ +/* This file uses _GL_ARG_NONNULL, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ #if !_GL_CONFIG_H_INCLUDED #error "Please include config.h first." #endif +#if (@GNULIB_ISALNUM_L@ || @GNULIB_ISALPHA_L@ || @GNULIB_ISBLANK_L@ \ + || @GNULIB_ISCNTRL_L@ || @GNULIB_ISDIGIT_L@ || @GNULIB_ISGRAPH_L@ \ + || @GNULIB_ISLOWER_L@ || @GNULIB_ISPRINT_L@ || @GNULIB_ISPUNCT_L@ \ + || @GNULIB_ISSPACE_L@ || @GNULIB_ISUPPER_L@ || @GNULIB_ISXDIGIT_L@ \ + || @GNULIB_TOLOWER_L@ || @GNULIB_TOUPPER_L@) +/* Get locale_t. */ +# include +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +/* The definition of _GL_ARG_NONNULL is copied here. */ + /* The definition of _GL_WARN_ON_USE is copied here. */ +/* Return non-zero if c is alphanumeric. */ +#if @GNULIB_ISALNUM_L@ +# if !@HAVE_ISALNUM_L@ +_GL_FUNCDECL_SYS (isalnum_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isalnum_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isalnum_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isalnum_l +# if HAVE_RAW_DECL_ISALNUM_L +_GL_WARN_ON_USE (isalnum_l, "isalnum_l is unportable - " + "use gnulib module isalnum_l for portability"); +# endif +#endif + +/* Return non-zero if c is alphabetic. */ +#if @GNULIB_ISALPHA_L@ +# if !@HAVE_ISALPHA_L@ +_GL_FUNCDECL_SYS (isalpha_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isalpha_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isalpha_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isalpha_l +# if HAVE_RAW_DECL_ISALPHA_L +_GL_WARN_ON_USE (isalpha_l, "isalpha_l is unportable - " + "use gnulib module isalpha_l for portability"); +# endif +#endif + /* Return non-zero if c is a blank, i.e. a space or tab character. */ #if @GNULIB_ISBLANK@ # if !@HAVE_ISBLANK@ @@ -58,5 +118,222 @@ _GL_WARN_ON_USE (isblank, "isblank is unportable - " # endif #endif +/* Return non-zero if c is a blank, i.e. a space or tab character. */ +#if @GNULIB_ISBLANK_L@ +# if !@HAVE_ISBLANK_L@ +_GL_FUNCDECL_SYS (isblank_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isblank_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isblank_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isblank_l +# if HAVE_RAW_DECL_ISBLANK_L +_GL_WARN_ON_USE (isblank_l, "isblank_l is unportable - " + "use gnulib module isblank_l for portability"); +# endif +#endif + +/* Return non-zero if c is a control character. */ +#if @GNULIB_ISCNTRL_L@ +# if !@HAVE_ISCNTRL_L@ +_GL_FUNCDECL_SYS (iscntrl_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (iscntrl_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (iscntrl_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef iscntrl_l +# if HAVE_RAW_DECL_ISCNTRL_L +_GL_WARN_ON_USE (iscntrl_l, "iscntrl_l is unportable - " + "use gnulib module iscntrl_l for portability"); +# endif +#endif + +/* Return non-zero if c is a digit. */ +#if @GNULIB_ISDIGIT_L@ +# if !@HAVE_ISDIGIT_L@ +_GL_FUNCDECL_SYS (isdigit_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isdigit_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isdigit_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isdigit_l +# if HAVE_RAW_DECL_ISDIGIT_L +_GL_WARN_ON_USE (isdigit_l, "isdigit_l is unportable - " + "use gnulib module isdigit_l for portability"); +# endif +#endif + +/* Return non-zero if c is graphic. */ +#if @GNULIB_ISGRAPH_L@ +# if !@HAVE_ISGRAPH_L@ +_GL_FUNCDECL_SYS (isgraph_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isgraph_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isgraph_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isgraph_l +# if HAVE_RAW_DECL_ISGRAPH_L +_GL_WARN_ON_USE (isgraph_l, "isgraph_l is unportable - " + "use gnulib module isgraph_l for portability"); +# endif +#endif + +/* Return non-zero if c is lowercase. */ +#if @GNULIB_ISLOWER_L@ +# if !@HAVE_ISLOWER_L@ +_GL_FUNCDECL_SYS (islower_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (islower_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (islower_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef islower_l +# if HAVE_RAW_DECL_ISLOWER_L +_GL_WARN_ON_USE (islower_l, "islower_l is unportable - " + "use gnulib module islower_l for portability"); +# endif +#endif + +/* Return non-zero if c is printable. */ +#if @GNULIB_ISPRINT_L@ +# if !@HAVE_ISPRINT_L@ +_GL_FUNCDECL_SYS (isprint_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isprint_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isprint_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isprint_l +# if HAVE_RAW_DECL_ISPRINT_L +_GL_WARN_ON_USE (isprint_l, "isprint_l is unportable - " + "use gnulib module isprint_l for portability"); +# endif +#endif + +/* Return non-zero if c is a punctuation or symbol character. */ +#if @GNULIB_ISPUNCT_L@ +# if !@HAVE_ISPUNCT_L@ +_GL_FUNCDECL_SYS (ispunct_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (ispunct_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (ispunct_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef ispunct_l +# if HAVE_RAW_DECL_ISPUNCT_L +_GL_WARN_ON_USE (ispunct_l, "ispunct_l is unportable - " + "use gnulib module ispunct_l for portability"); +# endif +#endif + +/* Return non-zero if c is white-space. */ +#if @GNULIB_ISSPACE_L@ +# if !@HAVE_ISSPACE_L@ +_GL_FUNCDECL_SYS (isspace_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isspace_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isspace_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isspace_l +# if HAVE_RAW_DECL_ISSPACE_L +_GL_WARN_ON_USE (isspace_l, "isspace_l is unportable - " + "use gnulib module isspace_l for portability"); +# endif +#endif + +/* Return non-zero if c is uppercase. */ +#if @GNULIB_ISUPPER_L@ +# if !@HAVE_ISUPPER_L@ +_GL_FUNCDECL_SYS (isupper_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isupper_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isupper_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isupper_l +# if HAVE_RAW_DECL_ISUPPER_L +_GL_WARN_ON_USE (isupper_l, "isupper_l is unportable - " + "use gnulib module isupper_l for portability"); +# endif +#endif + +/* Return non-zero if c is a hexadecimal digit. */ +#if @GNULIB_ISXDIGIT_L@ +# if !@HAVE_ISXDIGIT_L@ +_GL_FUNCDECL_SYS (isxdigit_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (isxdigit_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (isxdigit_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef isxdigit_l +# if HAVE_RAW_DECL_ISXDIGIT_L +_GL_WARN_ON_USE (isxdigit_l, "isxdigit_l is unportable - " + "use gnulib module isxdigit_l for portability"); +# endif +#endif + +/* Map c to lowercase. */ +#if @GNULIB_TOLOWER_L@ +# if !@HAVE_TOLOWER_L@ +_GL_FUNCDECL_SYS (tolower_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (tolower_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (tolower_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef tolower_l +# if HAVE_RAW_DECL_TOLOWER_L +_GL_WARN_ON_USE (tolower_l, "tolower_l is unportable - " + "use gnulib module tolower_l for portability"); +# endif +#endif + +/* Map c to uppercase. */ +#if @GNULIB_TOUPPER_L@ +# if !@HAVE_TOUPPER_L@ +_GL_FUNCDECL_SYS (toupper_l, int, (int c, locale_t locale), + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (toupper_l, int, (int c, locale_t locale)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (toupper_l); +# endif +#elif defined GNULIB_POSIXCHECK +# undef toupper_l +# if HAVE_RAW_DECL_TOUPPER_L +_GL_WARN_ON_USE (toupper_l, "toupper_l is unportable - " + "use gnulib module toupper_l for portability"); +# endif +#endif + #endif /* _@GUARD_PREFIX@_CTYPE_H */ +#endif #endif /* _@GUARD_PREFIX@_CTYPE_H */ -- cgit v1.2.3 From 5f59a34ab747dde8ede7357f3431bf06bd6002fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Mar 2026 17:28:33 +0100 Subject: New upstream version 1.4.2 --- tests/ctype.in.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'tests/ctype.in.h') diff --git a/tests/ctype.in.h b/tests/ctype.in.h index f0e62395..e57c2705 100644 --- a/tests/ctype.in.h +++ b/tests/ctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms on which it is incomplete. - Copyright (C) 2009-2025 Free Software Foundation, Inc. + Copyright (C) 2009-2026 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -80,7 +80,6 @@ _GL_CXXALIAS_SYS (isalnum_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isalnum_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isalnum_l # if HAVE_RAW_DECL_ISALNUM_L _GL_WARN_ON_USE (isalnum_l, "isalnum_l is unportable - " "use gnulib module isalnum_l for portability"); @@ -98,7 +97,6 @@ _GL_CXXALIAS_SYS (isalpha_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isalpha_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isalpha_l # if HAVE_RAW_DECL_ISALPHA_L _GL_WARN_ON_USE (isalpha_l, "isalpha_l is unportable - " "use gnulib module isalpha_l for portability"); @@ -111,7 +109,6 @@ _GL_WARN_ON_USE (isalpha_l, "isalpha_l is unportable - " _GL_EXTERN_C int isblank (int c); # endif #elif defined GNULIB_POSIXCHECK -# undef isblank # if HAVE_RAW_DECL_ISBLANK _GL_WARN_ON_USE (isblank, "isblank is unportable - " "use gnulib module isblank for portability"); @@ -129,7 +126,6 @@ _GL_CXXALIAS_SYS (isblank_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isblank_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isblank_l # if HAVE_RAW_DECL_ISBLANK_L _GL_WARN_ON_USE (isblank_l, "isblank_l is unportable - " "use gnulib module isblank_l for portability"); @@ -147,7 +143,6 @@ _GL_CXXALIAS_SYS (iscntrl_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (iscntrl_l); # endif #elif defined GNULIB_POSIXCHECK -# undef iscntrl_l # if HAVE_RAW_DECL_ISCNTRL_L _GL_WARN_ON_USE (iscntrl_l, "iscntrl_l is unportable - " "use gnulib module iscntrl_l for portability"); @@ -165,7 +160,6 @@ _GL_CXXALIAS_SYS (isdigit_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isdigit_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isdigit_l # if HAVE_RAW_DECL_ISDIGIT_L _GL_WARN_ON_USE (isdigit_l, "isdigit_l is unportable - " "use gnulib module isdigit_l for portability"); @@ -183,7 +177,6 @@ _GL_CXXALIAS_SYS (isgraph_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isgraph_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isgraph_l # if HAVE_RAW_DECL_ISGRAPH_L _GL_WARN_ON_USE (isgraph_l, "isgraph_l is unportable - " "use gnulib module isgraph_l for portability"); @@ -201,7 +194,6 @@ _GL_CXXALIAS_SYS (islower_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (islower_l); # endif #elif defined GNULIB_POSIXCHECK -# undef islower_l # if HAVE_RAW_DECL_ISLOWER_L _GL_WARN_ON_USE (islower_l, "islower_l is unportable - " "use gnulib module islower_l for portability"); @@ -219,7 +211,6 @@ _GL_CXXALIAS_SYS (isprint_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isprint_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isprint_l # if HAVE_RAW_DECL_ISPRINT_L _GL_WARN_ON_USE (isprint_l, "isprint_l is unportable - " "use gnulib module isprint_l for portability"); @@ -237,7 +228,6 @@ _GL_CXXALIAS_SYS (ispunct_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (ispunct_l); # endif #elif defined GNULIB_POSIXCHECK -# undef ispunct_l # if HAVE_RAW_DECL_ISPUNCT_L _GL_WARN_ON_USE (ispunct_l, "ispunct_l is unportable - " "use gnulib module ispunct_l for portability"); @@ -255,7 +245,6 @@ _GL_CXXALIAS_SYS (isspace_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isspace_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isspace_l # if HAVE_RAW_DECL_ISSPACE_L _GL_WARN_ON_USE (isspace_l, "isspace_l is unportable - " "use gnulib module isspace_l for portability"); @@ -273,7 +262,6 @@ _GL_CXXALIAS_SYS (isupper_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isupper_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isupper_l # if HAVE_RAW_DECL_ISUPPER_L _GL_WARN_ON_USE (isupper_l, "isupper_l is unportable - " "use gnulib module isupper_l for portability"); @@ -291,7 +279,6 @@ _GL_CXXALIAS_SYS (isxdigit_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (isxdigit_l); # endif #elif defined GNULIB_POSIXCHECK -# undef isxdigit_l # if HAVE_RAW_DECL_ISXDIGIT_L _GL_WARN_ON_USE (isxdigit_l, "isxdigit_l is unportable - " "use gnulib module isxdigit_l for portability"); @@ -309,7 +296,6 @@ _GL_CXXALIAS_SYS (tolower_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (tolower_l); # endif #elif defined GNULIB_POSIXCHECK -# undef tolower_l # if HAVE_RAW_DECL_TOLOWER_L _GL_WARN_ON_USE (tolower_l, "tolower_l is unportable - " "use gnulib module tolower_l for portability"); @@ -327,7 +313,6 @@ _GL_CXXALIAS_SYS (toupper_l, int, (int c, locale_t locale)); _GL_CXXALIASWARN (toupper_l); # endif #elif defined GNULIB_POSIXCHECK -# undef toupper_l # if HAVE_RAW_DECL_TOUPPER_L _GL_WARN_ON_USE (toupper_l, "toupper_l is unportable - " "use gnulib module toupper_l for portability"); -- cgit v1.2.3