From cf96562febc1ddb151c72c9c3f701ad63fe03e0d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 16 Sep 2024 09:45:36 -0700 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20port=20July=20[[...]]=20changes?= =?utf8?q?=20to=20C89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Yesterday’s changes to port to C17 and earlier were intrusive, since they twice replaced one macro with two. Revert the macro definitions to what they were before yesterday, and instead change callers so that they always have four arguments even if the last one is empty. Although this change requires C99 or later, that’s safe nowadays. Suggested by Bruno Haible in: https://lists.gnu.org/r/bug-gnulib/2024-09/msg00079.html * lib/c++defs.h (_GL_FUNCDECL_RPL, _GL_FUNCDECL_SYS): Revert yesterday’s changes. All callers changed. Add comments explaining the required comma before missing attrs. --- ChangeLog | 14 ++ lib/arpa_inet.in.h | 8 +- lib/c++defs.h | 58 +++---- lib/dirent.in.h | 32 ++-- lib/error.in.h | 8 +- lib/fcntl.in.h | 12 +- lib/fenv.in.h | 64 ++++---- lib/fnmatch.in.h | 4 +- lib/glob.in.h | 12 +- lib/iconv.in.h | 6 +- lib/inttypes.in.h | 16 +- lib/langinfo.in.h | 4 +- lib/locale.in.h | 10 +- lib/malloc.in.h | 10 +- lib/math.in.h | 360 +++++++++++++++++++++--------------------- lib/mntent.in.h | 4 +- lib/monetary.in.h | 2 +- lib/netdb.in.h | 14 +- lib/poll.in.h | 4 +- lib/pthread.in.h | 204 ++++++++++++------------ lib/pty.in.h | 8 +- lib/sched.in.h | 4 +- lib/search.in.h | 16 +- lib/signal.in.h | 32 ++-- lib/spawn.in.h | 92 +++++------ lib/stdio.in.h | 188 +++++++++++----------- lib/stdlib.in.h | 208 ++++++++++++------------ lib/string.in.h | 116 +++++++------- lib/strings.in.h | 2 +- lib/sys_ioctl.in.h | 4 +- lib/sys_random.in.h | 4 +- lib/sys_resource.in.h | 2 +- lib/sys_select.in.h | 6 +- lib/sys_socket.in.h | 32 ++-- lib/sys_stat.in.h | 48 +++--- lib/sys_time.in.h | 4 +- lib/sys_wait.in.h | 2 +- lib/termios.in.h | 2 +- lib/threads.in.h | 100 ++++++------ lib/time.in.h | 52 +++--- lib/uchar.in.h | 70 ++++---- lib/unistd.in.h | 190 +++++++++++----------- lib/utime.in.h | 4 +- lib/utmp.in.h | 4 +- lib/wchar.in.h | 132 ++++++++-------- lib/wctype.in.h | 26 +-- 46 files changed, 1101 insertions(+), 1093 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1dbeec233..8bf9e172c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2024-09-16 Paul Eggert + + Don’t port July [[...]] changes to C89 + Yesterday’s changes to port to C17 and earlier were intrusive, + since they twice replaced one macro with two. Revert the macro + definitions to what they were before yesterday, and instead change + callers so that they always have four arguments even if the last + one is empty. Although this change requires C99 or later, that’s + safe nowadays. Suggested by Bruno Haible in: + https://lists.gnu.org/r/bug-gnulib/2024-09/msg00079.html + * lib/c++defs.h (_GL_FUNCDECL_RPL, _GL_FUNCDECL_SYS): + Revert yesterday’s changes. All callers changed. + Add comments explaining the required comma before missing attrs. + 2024-09-16 Bruno Haible wchar: Fix compilation error (regression yesterday). diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index fef5be5852..16813d412a 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -135,7 +135,7 @@ ntohl (uint32_t value) # undef inet_ntop # define inet_ntop rpl_inet_ntop # endif -_GL_FUNCATTR_RPL (inet_ntop, const char *, +_GL_FUNCDECL_RPL (inet_ntop, const char *, (int af, const void *restrict src, char *restrict dst, socklen_t cnt), _GL_ARG_NONNULL ((2, 3))); @@ -144,7 +144,7 @@ _GL_CXXALIAS_RPL (inet_ntop, const char *, char *restrict dst, socklen_t cnt)); # else # if !@HAVE_DECL_INET_NTOP@ -_GL_FUNCATTR_SYS (inet_ntop, const char *, +_GL_FUNCDECL_SYS (inet_ntop, const char *, (int af, const void *restrict src, char *restrict dst, socklen_t cnt), _GL_ARG_NONNULL ((2, 3))); @@ -172,14 +172,14 @@ _GL_WARN_ON_USE (inet_ntop, "inet_ntop is unportable - " # undef inet_pton # define inet_pton rpl_inet_pton # endif -_GL_FUNCATTR_RPL (inet_pton, int, +_GL_FUNCDECL_RPL (inet_pton, int, (int af, const char *restrict src, void *restrict dst), _GL_ARG_NONNULL ((2, 3))); _GL_CXXALIAS_RPL (inet_pton, int, (int af, const char *restrict src, void *restrict dst)); # else # if !@HAVE_DECL_INET_PTON@ -_GL_FUNCATTR_SYS (inet_pton, int, +_GL_FUNCDECL_SYS (inet_pton, int, (int af, const char *restrict src, void *restrict dst), _GL_ARG_NONNULL ((2, 3))); # endif diff --git a/lib/c++defs.h b/lib/c++defs.h index fbc84a1ff4..7843359caa 100644 --- a/lib/c++defs.h +++ b/lib/c++defs.h @@ -104,48 +104,42 @@ # define _GL_EXTERN_C_FUNC #endif -/* _GL_FUNCDECL_RPL (func, rettype, parameters); - _GL_FUNCATTR_RPL (func, rettype, parameters, attributes); +/* _GL_FUNCDECL_RPL (func, rettype, parameters, [attributes]); declares a replacement function, named rpl_func, with the given prototype, - consisting of return type and parameters. Use _GL_FUNCDECL_RPL if the - function lacks attributes, _GL_FUNCATTR_RPL if it has them. - Example: - _GL_FUNCATTR_RPL (open, int, (const char *filename, int flags, ...), + consisting of return type, parameters, and attributes. + Although attributes are optional, the comma before them is required + for portability to C17 and earlier. The attribute _GL_ATTRIBUTE_NOTHROW, + if needed, must be placed after the _GL_FUNCDECL_RPL invocation, + at the end of the declaration. + Examples: + _GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW; + _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...), _GL_ARG_NONNULL ((1))); Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front - of an invocation only in C mode, not in C++ mode. (That's because + of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode. (That's + because [[...]] extern "C" ; is invalid syntax in C++.) - - Note: The attribute _GL_ATTRIBUTE_NOTHROW, if needed, must be placed outside - of the invocation, at the end of the declaration. */ -#define _GL_FUNCDECL_RPL(func,rettype,parameters) \ - _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters) -#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters) \ - _GL_EXTERN_C_FUNC rettype rpl_func parameters -#define _GL_FUNCATTR_RPL(func,rettype,parameters,attrs) \ - _GL_FUNCATTR_RPL_1 (rpl_##func, rettype, parameters, attrs) -#define _GL_FUNCATTR_RPL_1(rpl_func,rettype,parameters,attrs) \ - _GL_EXTERN_C_FUNC attrs rettype rpl_func parameters +#define _GL_FUNCDECL_RPL(func,rettype,parameters,...) \ + _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters, __VA_ARGS__) +#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \ + _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters -/* _GL_FUNCDECL_SYS (func, rettype, parameters); - _GL_FUNCATTR_SYS (func, rettype, parameters, attributes); +/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]); declares the system function, named func, with the given prototype, - consisting of return type and parameters. Use _GL_FUNCDECL_SYS if the - function lacks attributes, _GL_FUNCATTR_SYS if it has them. - Example: - _GL_FUNCATTR_SYS (open, int, (const char *filename, int flags, ...), - _GL_ARG_NONNULL ((1))); - - Note: The attribute _GL_ATTRIBUTE_NOTHROW, if needed, must be placed outside - of the invocation, at the end of the declaration. + consisting of return type, parameters, and attributes. + Although attributes are optional, the comma before them is required + for portability to C17 and earlier. The attribute _GL_ATTRIBUTE_NOTHROW, + if needed, must be placed after the _GL_FUNCDECL_RPL invocation, + at the end of the declaration. + Examples: + _GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW; + _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); */ -#define _GL_FUNCDECL_SYS(func,rettype,parameters) \ - _GL_EXTERN_C_FUNC rettype func parameters -#define _GL_FUNCATTR_SYS(func,rettype,parameters,attrs) \ - _GL_EXTERN_C_FUNC attrs rettype func parameters +#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \ + _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters /* _GL_CXXALIAS_RPL (func, rettype, parameters); declares a C++ alias called GNULIB_NAMESPACE::func diff --git a/lib/dirent.in.h b/lib/dirent.in.h index b377134c87..7ba8fc64d8 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -122,11 +122,11 @@ typedef struct gl_directory DIR; # define closedir rpl_closedir # define GNULIB_defined_closedir 1 # endif -_GL_FUNCATTR_RPL (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); # else # if !@HAVE_CLOSEDIR@ -_GL_FUNCATTR_SYS (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); # endif @@ -146,14 +146,14 @@ _GL_WARN_ON_USE (closedir, "closedir is not portable - " # define opendir rpl_opendir # define GNULIB_defined_opendir 1 # endif -_GL_FUNCATTR_RPL (opendir, DIR *, +_GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); # else # if !@HAVE_OPENDIR@ || (__GNUC__ >= 11 && !defined __clang__) -_GL_FUNCATTR_SYS (opendir, DIR *, +_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); @@ -166,7 +166,7 @@ _GL_CXXALIASWARN (opendir); && (__GNUC__ >= 11 && !defined __clang__) && !defined opendir /* For -Wmismatched-dealloc: Associate opendir with closedir or rpl_closedir. */ -_GL_FUNCATTR_SYS (opendir, DIR *, +_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); @@ -186,11 +186,11 @@ _GL_WARN_ON_USE (opendir, "opendir is not portable - " # undef readdir # define readdir rpl_readdir # endif -_GL_FUNCATTR_RPL (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (readdir, struct dirent *, (DIR *dirp)); # else # if !@HAVE_READDIR@ -_GL_FUNCATTR_SYS (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (readdir, struct dirent *, (DIR *dirp)); # endif @@ -209,11 +209,11 @@ _GL_WARN_ON_USE (readdir, "readdir is not portable - " # undef rewinddir # define rewinddir rpl_rewinddir # endif -_GL_FUNCATTR_RPL (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (rewinddir, void, (DIR *dirp)); # else # if !@HAVE_REWINDDIR@ -_GL_FUNCATTR_SYS (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (rewinddir, void, (DIR *dirp)); # endif @@ -235,7 +235,7 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " # undef dirfd # define dirfd rpl_dirfd # endif -_GL_FUNCATTR_RPL (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (dirfd, int, (DIR *)); # else @@ -246,7 +246,7 @@ static inline int (dirfd) (DIR *dp) { return dirfd (dp); } # undef dirfd # endif # if !(@HAVE_DECL_DIRFD@ || defined dirfd) -_GL_FUNCATTR_SYS (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (dirfd, int, (DIR *)); # endif @@ -270,14 +270,14 @@ _GL_WARN_ON_USE (dirfd, "dirfd is unportable - " # undef fdopendir # define fdopendir rpl_fdopendir # endif -_GL_FUNCATTR_RPL (fdopendir, DIR *, +_GL_FUNCDECL_RPL (fdopendir, DIR *, (int fd), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); _GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd)); # else # if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ \ || (__GNUC__ >= 11 && !defined __clang__) -_GL_FUNCATTR_SYS (fdopendir, DIR *, +_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); # endif @@ -289,7 +289,7 @@ _GL_CXXALIASWARN (fdopendir); && (__GNUC__ >= 11 && !defined __clang__) && !defined fdopendir /* For -Wmismatched-dealloc: Associate fdopendir with closedir or rpl_closedir. */ -_GL_FUNCATTR_SYS (fdopendir, DIR *, +_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); # endif @@ -308,7 +308,7 @@ _GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - " sorted using qsort with CMP, and collected in a malloc'd array in *NAMELIST. Returns the number of entries selected, or -1 on error. */ # if !@HAVE_SCANDIR@ -_GL_FUNCATTR_SYS (scandir, int, +_GL_FUNCDECL_SYS (scandir, int, (const char *dir, struct dirent ***namelist, int (*filter) (const struct dirent *), int (*cmp) (const struct dirent **, const struct dirent **)), @@ -332,7 +332,7 @@ _GL_WARN_ON_USE (scandir, "scandir is unportable - " #if @GNULIB_ALPHASORT@ /* Compare two 'struct dirent' entries alphabetically. */ # if !@HAVE_ALPHASORT@ -_GL_FUNCATTR_SYS (alphasort, int, +_GL_FUNCDECL_SYS (alphasort, int, (const struct dirent **, const struct dirent **), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); diff --git a/lib/error.in.h b/lib/error.in.h index f8626dca93..4804c8c465 100644 --- a/lib/error.in.h +++ b/lib/error.in.h @@ -94,7 +94,7 @@ extern "C" { # undef error # define error rpl_error # endif -_GL_FUNCATTR_RPL (error, void, +_GL_FUNCDECL_RPL (error, void, (int __status, int __errnum, const char *__format, ...), _GL_ATTRIBUTE_COLD _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); @@ -107,7 +107,7 @@ _GL_CXXALIAS_RPL (error, void, # endif #else # if ! @HAVE_ERROR@ -_GL_FUNCATTR_SYS (error, void, +_GL_FUNCDECL_SYS (error, void, (int __status, int __errnum, const char *__format, ...), _GL_ATTRIBUTE_COLD _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); @@ -150,7 +150,7 @@ _GL_CXXALIASWARN (error); # undef error_at_line # define error_at_line rpl_error_at_line # endif -_GL_FUNCATTR_RPL (error_at_line, void, +_GL_FUNCDECL_RPL (error_at_line, void, (int __status, int __errnum, const char *__filename, unsigned int __lineno, const char *__format, ...), _GL_ATTRIBUTE_COLD @@ -165,7 +165,7 @@ _GL_CXXALIAS_RPL (error_at_line, void, # endif #else # if ! @HAVE_ERROR_AT_LINE@ -_GL_FUNCATTR_SYS (error_at_line, void, +_GL_FUNCDECL_SYS (error_at_line, void, (int __status, int __errnum, const char *__filename, unsigned int __lineno, const char *__format, ...), _GL_ATTRIBUTE_COLD diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index 99624d302f..fc65d40bc0 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -100,7 +100,7 @@ # undef creat # define creat rpl_creat # endif -_GL_FUNCATTR_RPL (creat, int, (const char *filename, mode_t mode), +_GL_FUNCDECL_RPL (creat, int, (const char *filename, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (creat, int, (const char *filename, mode_t mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -141,14 +141,14 @@ _GL_CXXALIASWARN (creat); # undef fcntl # define fcntl rpl_fcntl # endif -_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...)); +_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...), ); _GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...)); # if !GNULIB_defined_rpl_fcntl # define GNULIB_defined_rpl_fcntl 1 # endif # else # if !@HAVE_FCNTL@ -_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...)); +_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...), ); # if !GNULIB_defined_fcntl # define GNULIB_defined_fcntl 1 # endif @@ -170,7 +170,7 @@ _GL_WARN_ON_USE (fcntl, "fcntl is not always POSIX compliant - " # undef open # define open rpl_open # endif -_GL_FUNCATTR_RPL (open, int, (const char *filename, int flags, ...), +_GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -216,14 +216,14 @@ _GL_CXXALIASWARN (open); # undef openat # define openat rpl_openat # endif -_GL_FUNCATTR_RPL (openat, int, +_GL_FUNCDECL_RPL (openat, int, (int fd, char const *file, int flags, /* mode_t mode */ ...), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (openat, int, (int fd, char const *file, int flags, /* mode_t mode */ ...)); # else # if !@HAVE_OPENAT@ -_GL_FUNCATTR_SYS (openat, int, +_GL_FUNCDECL_SYS (openat, int, (int fd, char const *file, int flags, /* mode_t mode */ ...), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/fenv.in.h b/lib/fenv.in.h index 422cafeec7..cae1c77843 100644 --- a/lib/fenv.in.h +++ b/lib/fenv.in.h @@ -180,11 +180,11 @@ typedef unsigned long fenv_t; # undef fegetenv # define fegetenv rpl_fegetenv # endif -_GL_FUNCDECL_RPL (fegetenv, int, (fenv_t *envp)); +_GL_FUNCDECL_RPL (fegetenv, int, (fenv_t *envp), ); _GL_CXXALIAS_RPL (fegetenv, int, (fenv_t *envp)); # else # if !@HAVE_FEGETENV@ -_GL_FUNCDECL_SYS (fegetenv, int, (fenv_t *envp)); +_GL_FUNCDECL_SYS (fegetenv, int, (fenv_t *envp), ); # endif _GL_CXXALIAS_SYS (fegetenv, int, (fenv_t *envp)); # endif @@ -201,11 +201,11 @@ _GL_CXXALIASWARN (fegetenv); # undef fesetenv # define fesetenv rpl_fesetenv # endif -_GL_FUNCDECL_RPL (fesetenv, int, (fenv_t const *envp)); +_GL_FUNCDECL_RPL (fesetenv, int, (fenv_t const *envp), ); _GL_CXXALIAS_RPL (fesetenv, int, (fenv_t const *envp)); # else # if !@HAVE_FESETENV@ -_GL_FUNCDECL_SYS (fesetenv, int, (fenv_t const *envp)); +_GL_FUNCDECL_SYS (fesetenv, int, (fenv_t const *envp), ); # endif _GL_CXXALIAS_SYS (fesetenv, int, (fenv_t const *envp)); # endif @@ -223,11 +223,11 @@ _GL_CXXALIASWARN (fesetenv); # undef feupdateenv # define feupdateenv rpl_feupdateenv # endif -_GL_FUNCDECL_RPL (feupdateenv, int, (fenv_t const *envp)); +_GL_FUNCDECL_RPL (feupdateenv, int, (fenv_t const *envp), ); _GL_CXXALIAS_RPL (feupdateenv, int, (fenv_t const *envp)); # else # if !@HAVE_FEUPDATEENV@ -_GL_FUNCDECL_SYS (feupdateenv, int, (fenv_t const *envp)); +_GL_FUNCDECL_SYS (feupdateenv, int, (fenv_t const *envp), ); # endif _GL_CXXALIAS_SYS (feupdateenv, int, (fenv_t const *envp)); # endif @@ -244,11 +244,11 @@ _GL_CXXALIASWARN (feupdateenv); # undef feholdexcept # define feholdexcept rpl_feholdexcept # endif -_GL_FUNCDECL_RPL (feholdexcept, int, (fenv_t *envp)); +_GL_FUNCDECL_RPL (feholdexcept, int, (fenv_t *envp), ); _GL_CXXALIAS_RPL (feholdexcept, int, (fenv_t *envp)); # else # if !@HAVE_FEHOLDEXCEPT@ -_GL_FUNCDECL_SYS (feholdexcept, int, (fenv_t *envp)); +_GL_FUNCDECL_SYS (feholdexcept, int, (fenv_t *envp), ); # endif _GL_CXXALIAS_SYS (feholdexcept, int, (fenv_t *envp)); # endif @@ -384,11 +384,11 @@ _GL_CXXALIASWARN (feholdexcept); # undef fegetround # define fegetround rpl_fegetround # endif -_GL_FUNCDECL_RPL (fegetround, int, (void)); +_GL_FUNCDECL_RPL (fegetround, int, (void), ); _GL_CXXALIAS_RPL (fegetround, int, (void)); # else # if !@HAVE_FEGETROUND@ -_GL_FUNCDECL_SYS (fegetround, int, (void)); +_GL_FUNCDECL_SYS (fegetround, int, (void), ); # endif _GL_CXXALIAS_SYS (fegetround, int, (void)); # endif @@ -404,11 +404,11 @@ _GL_CXXALIASWARN (fegetround); # undef fesetround # define fesetround rpl_fesetround # endif -_GL_FUNCDECL_RPL (fesetround, int, (int rounding_direction)); +_GL_FUNCDECL_RPL (fesetround, int, (int rounding_direction), ); _GL_CXXALIAS_RPL (fesetround, int, (int rounding_direction)); # else # if !@HAVE_FESETROUND@ -_GL_FUNCDECL_SYS (fesetround, int, (int rounding_direction)); +_GL_FUNCDECL_SYS (fesetround, int, (int rounding_direction), ); # endif _GL_CXXALIAS_SYS (fesetround, int, (int rounding_direction)); # endif @@ -554,11 +554,11 @@ _GL_CXXALIASWARN (fesetround); # undef feclearexcept # define feclearexcept rpl_feclearexcept # endif -_GL_FUNCDECL_RPL (feclearexcept, int, (int exceptions)); +_GL_FUNCDECL_RPL (feclearexcept, int, (int exceptions), ); _GL_CXXALIAS_RPL (feclearexcept, int, (int exceptions)); # else # if !@HAVE_FECLEAREXCEPT@ -_GL_FUNCDECL_SYS (feclearexcept, int, (int exceptions)); +_GL_FUNCDECL_SYS (feclearexcept, int, (int exceptions), ); # endif _GL_CXXALIAS_SYS (feclearexcept, int, (int exceptions)); # endif @@ -573,11 +573,11 @@ _GL_CXXALIASWARN (feclearexcept); # undef feraiseexcept # define feraiseexcept rpl_feraiseexcept # endif -_GL_FUNCDECL_RPL (feraiseexcept, int, (int exceptions)); +_GL_FUNCDECL_RPL (feraiseexcept, int, (int exceptions), ); _GL_CXXALIAS_RPL (feraiseexcept, int, (int exceptions)); # else # if !@HAVE_FERAISEEXCEPT@ -_GL_FUNCDECL_SYS (feraiseexcept, int, (int exceptions)); +_GL_FUNCDECL_SYS (feraiseexcept, int, (int exceptions), ); # endif _GL_CXXALIAS_SYS (feraiseexcept, int, (int exceptions)); # endif @@ -592,11 +592,11 @@ _GL_CXXALIASWARN (feraiseexcept); # undef fetestexcept # define fetestexcept rpl_fetestexcept # endif -_GL_FUNCDECL_RPL (fetestexcept, int, (int exceptions)); +_GL_FUNCDECL_RPL (fetestexcept, int, (int exceptions), ); _GL_CXXALIAS_RPL (fetestexcept, int, (int exceptions)); # else # if !@HAVE_FETESTEXCEPT@ -_GL_FUNCDECL_SYS (fetestexcept, int, (int exceptions)); +_GL_FUNCDECL_SYS (fetestexcept, int, (int exceptions), ); # endif _GL_CXXALIAS_SYS (fetestexcept, int, (int exceptions)); # endif @@ -613,11 +613,11 @@ _GL_CXXALIASWARN (fetestexcept); # undef fesetexcept # define fesetexcept rpl_fesetexcept # endif -_GL_FUNCDECL_RPL (fesetexcept, int, (int exceptions)); +_GL_FUNCDECL_RPL (fesetexcept, int, (int exceptions), ); _GL_CXXALIAS_RPL (fesetexcept, int, (int exceptions)); # else # if !@HAVE_FESETEXCEPT@ -_GL_FUNCDECL_SYS (fesetexcept, int, (int exceptions)); +_GL_FUNCDECL_SYS (fesetexcept, int, (int exceptions), ); # endif _GL_CXXALIAS_SYS (fesetexcept, int, (int exceptions)); # endif @@ -646,11 +646,11 @@ _GL_WARN_ON_USE (fesetexcept, "fesetexcept is unportable - " # undef feenableexcept # define feenableexcept rpl_feenableexcept # endif -_GL_FUNCDECL_RPL (feenableexcept, int, (int exceptions)); +_GL_FUNCDECL_RPL (feenableexcept, int, (int exceptions), ); _GL_CXXALIAS_RPL (feenableexcept, int, (int exceptions)); # else # if !@HAVE_FEENABLEEXCEPT@ -_GL_FUNCDECL_SYS (feenableexcept, int, (int exceptions)); +_GL_FUNCDECL_SYS (feenableexcept, int, (int exceptions), ); # endif _GL_CXXALIAS_SYS (feenableexcept, int, (int exceptions)); # endif @@ -676,11 +676,11 @@ _GL_WARN_ON_USE (feenableexcept, "feenableexcept is unportable - " # undef fedisableexcept # define fedisableexcept rpl_fedisableexcept # endif -_GL_FUNCDECL_RPL (fedisableexcept, int, (int exceptions)); +_GL_FUNCDECL_RPL (fedisableexcept, int, (int exceptions), ); _GL_CXXALIAS_RPL (fedisableexcept, int, (int exceptions)); # else # if !@HAVE_FEDISABLEEXCEPT@ -_GL_FUNCDECL_SYS (fedisableexcept, int, (int exceptions)); +_GL_FUNCDECL_SYS (fedisableexcept, int, (int exceptions), ); # endif _GL_CXXALIAS_SYS (fedisableexcept, int, (int exceptions)); # endif @@ -707,11 +707,11 @@ _GL_WARN_ON_USE (fedisableexcept, "fedisableexcept is unportable - " # undef fegetexcept # define fegetexcept rpl_fegetexcept # endif -_GL_FUNCDECL_RPL (fegetexcept, int, (void)); +_GL_FUNCDECL_RPL (fegetexcept, int, (void), ); _GL_CXXALIAS_RPL (fegetexcept, int, (void)); # else # if !@HAVE_FEGETEXCEPT@ -_GL_FUNCDECL_SYS (fegetexcept, int, (void)); +_GL_FUNCDECL_SYS (fegetexcept, int, (void), ); # endif _GL_CXXALIAS_SYS (fegetexcept, int, (void)); # endif @@ -803,13 +803,13 @@ typedef unsigned long fexcept_t; # define fegetexceptflag rpl_fegetexceptflag # endif _GL_FUNCDECL_RPL (fegetexceptflag, int, - (fexcept_t *saved_flags, int exceptions)); + (fexcept_t *saved_flags, int exceptions), ); _GL_CXXALIAS_RPL (fegetexceptflag, int, (fexcept_t *saved_flags, int exceptions)); # else # if !@HAVE_FEGETEXCEPTFLAG@ _GL_FUNCDECL_SYS (fegetexceptflag, int, - (fexcept_t *saved_flags, int exceptions)); + (fexcept_t *saved_flags, int exceptions), ); # endif _GL_CXXALIAS_SYS (fegetexceptflag, int, (fexcept_t *saved_flags, int exceptions)); @@ -826,13 +826,13 @@ _GL_CXXALIASWARN (fegetexceptflag); # define fesetexceptflag rpl_fesetexceptflag # endif _GL_FUNCDECL_RPL (fesetexceptflag, int, - (fexcept_t const *saved_flags, int exceptions)); + (fexcept_t const *saved_flags, int exceptions), ); _GL_CXXALIAS_RPL (fesetexceptflag, int, (fexcept_t const *saved_flags, int exceptions)); # else # if !@HAVE_FESETEXCEPTFLAG@ _GL_FUNCDECL_SYS (fesetexceptflag, int, - (fexcept_t const *saved_flags, int exceptions)); + (fexcept_t const *saved_flags, int exceptions), ); # endif _GL_CXXALIAS_SYS (fesetexceptflag, int, (fexcept_t const *saved_flags, int exceptions)); @@ -851,13 +851,13 @@ _GL_CXXALIASWARN (fesetexceptflag); # define fetestexceptflag rpl_fetestexceptflag # endif _GL_FUNCDECL_RPL (fetestexceptflag, int, - (fexcept_t const *saved_flags, int exceptions)); + (fexcept_t const *saved_flags, int exceptions), ); _GL_CXXALIAS_RPL (fetestexceptflag, int, (fexcept_t const *saved_flags, int exceptions)); # else # if !@HAVE_FETESTEXCEPTFLAG@ _GL_FUNCDECL_SYS (fetestexceptflag, int, - (fexcept_t const *saved_flags, int exceptions)); + (fexcept_t const *saved_flags, int exceptions), ); # endif _GL_CXXALIAS_SYS (fetestexceptflag, int, (fexcept_t const *saved_flags, int exceptions)); diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index f8199ebe91..5482dba8c6 100644 --- a/lib/fnmatch.in.h +++ b/lib/fnmatch.in.h @@ -85,7 +85,7 @@ # define fnmatch rpl_fnmatch # endif # define GNULIB_defined_fnmatch_function 1 -_GL_FUNCATTR_RPL (fnmatch, int, +_GL_FUNCDECL_RPL (fnmatch, int, (const char *pattern, const char *name, int flags), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (fnmatch, int, @@ -93,7 +93,7 @@ _GL_CXXALIAS_RPL (fnmatch, int, # else # if !@HAVE_FNMATCH@ # define GNULIB_defined_fnmatch_function 1 -_GL_FUNCATTR_SYS (fnmatch, int, +_GL_FUNCDECL_SYS (fnmatch, int, (const char *pattern, const char *name, int flags), _GL_ARG_NONNULL ((1, 2))); # endif diff --git a/lib/glob.in.h b/lib/glob.in.h index fd59128f17..f92f409338 100644 --- a/lib/glob.in.h +++ b/lib/glob.in.h @@ -107,7 +107,7 @@ typedef int (*_gl_glob_errfunc_fn) (const char *, int); #if @GNULIB_GLOB@ # if @REPLACE_GLOB@ -_GL_FUNCATTR_RPL (glob, int, (const char *_Restrict_ __pattern, int __flags, +_GL_FUNCDECL_RPL (glob, int, (const char *_Restrict_ __pattern, int __flags, _gl_glob_errfunc_fn __errfunc, glob_t *_Restrict_ __pglob), _GL_ARG_NONNULL ((1))); @@ -116,7 +116,7 @@ _GL_CXXALIAS_RPL (glob, int, (const char *_Restrict_ __pattern, int __flags, glob_t *_Restrict_ __pglob)); # else # if !@HAVE_GLOB@ -_GL_FUNCATTR_SYS (glob, int, (const char *_Restrict_ __pattern, int __flags, +_GL_FUNCDECL_SYS (glob, int, (const char *_Restrict_ __pattern, int __flags, _gl_glob_errfunc_fn __errfunc, glob_t *_Restrict_ __pglob), _GL_ARG_NONNULL ((1))); @@ -139,11 +139,11 @@ _GL_WARN_ON_USE (glob, #if @GNULIB_GLOB@ # if @REPLACE_GLOB@ -_GL_FUNCATTR_RPL (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (globfree, void, (glob_t *__pglob)); # else # if !@HAVE_GLOB@ -_GL_FUNCATTR_SYS (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (globfree, void, (glob_t *__pglob)); # endif @@ -159,12 +159,12 @@ _GL_WARN_ON_USE (globfree, #if @GNULIB_GLOB@ # if @REPLACE_GLOB_PATTERN_P@ -_GL_FUNCATTR_RPL (glob_pattern_p, int, (const char *__pattern, int __quote), +_GL_FUNCDECL_RPL (glob_pattern_p, int, (const char *__pattern, int __quote), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (glob_pattern_p, int, (const char *__pattern, int __quote)); # else # if !@HAVE_GLOB_PATTERN_P@ -_GL_FUNCATTR_SYS (glob_pattern_p, int, (const char *__pattern, int __quote), +_GL_FUNCDECL_SYS (glob_pattern_p, int, (const char *__pattern, int __quote), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (glob_pattern_p, int, (const char *__pattern, int __quote)); diff --git a/lib/iconv.in.h b/lib/iconv.in.h index 1feb82482b..07d22f1301 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -47,7 +47,7 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define iconv_open rpl_iconv_open # endif -_GL_FUNCATTR_RPL (iconv_open, iconv_t, +_GL_FUNCDECL_RPL (iconv_open, iconv_t, (const char *tocode, const char *fromcode), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (iconv_open, iconv_t, @@ -87,7 +87,7 @@ _GL_FUNCDECL_RPL (iconv, size_t, (iconv_t cd, @ICONV_CONST@ char **restrict inbuf, size_t *restrict inbytesleft, - char **restrict outbuf, size_t *restrict outbytesleft)); + char **restrict outbuf, size_t *restrict outbytesleft), ); _GL_CXXALIAS_RPL (iconv, size_t, (iconv_t cd, @ICONV_CONST@ char **restrict inbuf, @@ -119,7 +119,7 @@ _GL_WARN_ON_USE (iconv, "iconv is not working correctly everywhere - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define iconv_close rpl_iconv_close # endif -_GL_FUNCDECL_RPL (iconv_close, int, (iconv_t cd)); +_GL_FUNCDECL_RPL (iconv_close, int, (iconv_t cd), ); _GL_CXXALIAS_RPL (iconv_close, int, (iconv_t cd)); # else _GL_CXXALIAS_SYS (iconv_close, int, (iconv_t cd)); diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index ad3798cc34..747f1bb787 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -913,11 +913,11 @@ extern "C" { # undef imaxabs # define imaxabs rpl_imaxabs # endif -_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x)); +_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x), ); _GL_CXXALIAS_RPL (imaxabs, intmax_t, (intmax_t x)); # else # if !@HAVE_DECL_IMAXABS@ -_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x)); +_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x), ); # endif _GL_CXXALIAS_SYS (imaxabs, intmax_t, (intmax_t x)); # endif @@ -944,11 +944,11 @@ typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t; # undef imaxdiv # define imaxdiv rpl_imaxdiv # endif -_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); +_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom), ); _GL_CXXALIAS_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); # else # if !@HAVE_DECL_IMAXDIV@ -_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); +_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom), ); # endif _GL_CXXALIAS_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); # endif @@ -969,7 +969,7 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - " # undef strtoimax # define strtoimax rpl_strtoimax # endif -_GL_FUNCATTR_RPL (strtoimax, intmax_t, +_GL_FUNCDECL_RPL (strtoimax, intmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtoimax, intmax_t, @@ -977,7 +977,7 @@ _GL_CXXALIAS_RPL (strtoimax, intmax_t, # else # if !@HAVE_DECL_STRTOIMAX@ # undef strtoimax -_GL_FUNCATTR_SYS (strtoimax, intmax_t, +_GL_FUNCDECL_SYS (strtoimax, intmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); # endif @@ -999,7 +999,7 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - " # undef strtoumax # define strtoumax rpl_strtoumax # endif -_GL_FUNCATTR_RPL (strtoumax, uintmax_t, +_GL_FUNCDECL_RPL (strtoumax, uintmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtoumax, uintmax_t, @@ -1007,7 +1007,7 @@ _GL_CXXALIAS_RPL (strtoumax, uintmax_t, # else # if !@HAVE_DECL_STRTOUMAX@ # undef strtoumax -_GL_FUNCATTR_SYS (strtoumax, uintmax_t, +_GL_FUNCDECL_SYS (strtoumax, uintmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); # endif diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h index febbd25f24..9c14e06ff4 100644 --- a/lib/langinfo.in.h +++ b/lib/langinfo.in.h @@ -205,11 +205,11 @@ typedef int nl_item; # undef nl_langinfo # define nl_langinfo rpl_nl_langinfo # endif -_GL_FUNCDECL_RPL (nl_langinfo, char *, (nl_item item)); +_GL_FUNCDECL_RPL (nl_langinfo, char *, (nl_item item), ); _GL_CXXALIAS_RPL (nl_langinfo, char *, (nl_item item)); # else # if !@HAVE_NL_LANGINFO@ -_GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item)); +_GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item), ); # endif _GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item)); # endif diff --git a/lib/locale.in.h b/lib/locale.in.h index e8d08c9345..c3d34085de 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -168,7 +168,7 @@ struct lconv # undef localeconv # define localeconv rpl_localeconv # endif -_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void)); +_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void), ); _GL_CXXALIAS_RPL (localeconv, struct lconv *, (void)); # else _GL_CXXALIAS_SYS (localeconv, struct lconv *, (void)); @@ -197,7 +197,7 @@ _GL_WARN_ON_USE (localeconv, # define setlocale rpl_setlocale # define GNULIB_defined_setlocale 1 # endif -_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale)); +_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale), ); _GL_CXXALIAS_RPL (setlocale, char *, (int category, const char *locale)); # else _GL_CXXALIAS_SYS (setlocale, char *, (int category, const char *locale)); @@ -225,7 +225,7 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - " # define newlocale rpl_newlocale # define GNULIB_defined_newlocale 1 # endif -_GL_FUNCATTR_RPL (newlocale, locale_t, +_GL_FUNCDECL_RPL (newlocale, locale_t, (int category_mask, const char *name, locale_t base), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (newlocale, locale_t, @@ -259,7 +259,7 @@ _GL_WARN_ON_USE (newlocale, "newlocale is not portable"); # define duplocale rpl_duplocale # define GNULIB_defined_duplocale 1 # endif -_GL_FUNCATTR_RPL (duplocale, locale_t, (locale_t locale), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale)); # else _GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale)); @@ -288,7 +288,7 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - " # define freelocale rpl_freelocale # define GNULIB_defined_freelocale 1 # endif -_GL_FUNCATTR_RPL (freelocale, void, (locale_t locale), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (freelocale, void, (locale_t locale), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (freelocale, void, (locale_t locale)); # else # if @HAVE_FREELOCALE@ diff --git a/lib/malloc.in.h b/lib/malloc.in.h index 922d8ed388..a22a4a8a39 100644 --- a/lib/malloc.in.h +++ b/lib/malloc.in.h @@ -141,7 +141,7 @@ _GL_EXTERN_C void free (void *); # undef memalign # define memalign rpl_memalign # endif -_GL_FUNCATTR_RPL (memalign, void *, +_GL_FUNCDECL_RPL (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -151,13 +151,13 @@ _GL_CXXALIAS_RPL (memalign, void *, (size_t alignment, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate memalign with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (memalign, void *, +_GL_FUNCDECL_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (memalign, void *, +_GL_FUNCDECL_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -173,12 +173,12 @@ _GL_CXXALIASWARN (memalign); # if (__GNUC__ >= 11 && !defined __clang__) && !defined memalign /* For -Wmismatched-dealloc: Associate memalign with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (memalign, void *, +_GL_FUNCDECL_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (memalign, void *, +_GL_FUNCDECL_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE); # endif diff --git a/lib/math.in.h b/lib/math.in.h index 51818d1508..75d6351a9c 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -277,12 +277,12 @@ _NaN () # undef acosf # define acosf rpl_acosf # endif -_GL_FUNCDECL_RPL (acosf, float, (float x)); +_GL_FUNCDECL_RPL (acosf, float, (float x), ); _GL_CXXALIAS_RPL (acosf, float, (float x)); # else # if !@HAVE_ACOSF@ # undef acosf -_GL_FUNCDECL_SYS (acosf, float, (float x)); +_GL_FUNCDECL_SYS (acosf, float, (float x), ); # endif _GL_CXXALIAS_SYS (acosf, float, (float x)); # endif @@ -298,7 +298,7 @@ _GL_WARN_ON_USE (acosf, "acosf is unportable - " #if @GNULIB_ACOSL@ # if !@HAVE_ACOSL@ || !@HAVE_DECL_ACOSL@ # undef acosl -_GL_FUNCDECL_SYS (acosl, long double, (long double x)); +_GL_FUNCDECL_SYS (acosl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (acosl, long double, (long double x)); # if __GLIBC__ >= 2 @@ -319,12 +319,12 @@ _GL_WARN_ON_USE (acosl, "acosl is unportable - " # undef asinf # define asinf rpl_asinf # endif -_GL_FUNCDECL_RPL (asinf, float, (float x)); +_GL_FUNCDECL_RPL (asinf, float, (float x), ); _GL_CXXALIAS_RPL (asinf, float, (float x)); # else # if !@HAVE_ASINF@ # undef asinf -_GL_FUNCDECL_SYS (asinf, float, (float x)); +_GL_FUNCDECL_SYS (asinf, float, (float x), ); # endif _GL_CXXALIAS_SYS (asinf, float, (float x)); # endif @@ -340,7 +340,7 @@ _GL_WARN_ON_USE (asinf, "asinf is unportable - " #if @GNULIB_ASINL@ # if !@HAVE_ASINL@ || !@HAVE_DECL_ASINL@ # undef asinl -_GL_FUNCDECL_SYS (asinl, long double, (long double x)); +_GL_FUNCDECL_SYS (asinl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (asinl, long double, (long double x)); # if __GLIBC__ >= 2 @@ -361,12 +361,12 @@ _GL_WARN_ON_USE (asinl, "asinl is unportable - " # undef atanf # define atanf rpl_atanf # endif -_GL_FUNCDECL_RPL (atanf, float, (float x)); +_GL_FUNCDECL_RPL (atanf, float, (float x), ); _GL_CXXALIAS_RPL (atanf, float, (float x)); # else # if !@HAVE_ATANF@ # undef atanf -_GL_FUNCDECL_SYS (atanf, float, (float x)); +_GL_FUNCDECL_SYS (atanf, float, (float x), ); # endif _GL_CXXALIAS_SYS (atanf, float, (float x)); # endif @@ -382,7 +382,7 @@ _GL_WARN_ON_USE (atanf, "atanf is unportable - " #if @GNULIB_ATANL@ # if !@HAVE_ATANL@ || !@HAVE_DECL_ATANL@ # undef atanl -_GL_FUNCDECL_SYS (atanl, long double, (long double x)); +_GL_FUNCDECL_SYS (atanl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (atanl, long double, (long double x)); # if __GLIBC__ >= 2 @@ -403,12 +403,12 @@ _GL_WARN_ON_USE (atanl, "atanl is unportable - " # undef atan2f # define atan2f rpl_atan2f # endif -_GL_FUNCDECL_RPL (atan2f, float, (float y, float x)); +_GL_FUNCDECL_RPL (atan2f, float, (float y, float x), ); _GL_CXXALIAS_RPL (atan2f, float, (float y, float x)); # else # if !@HAVE_ATAN2F@ # undef atan2f -_GL_FUNCDECL_SYS (atan2f, float, (float y, float x)); +_GL_FUNCDECL_SYS (atan2f, float, (float y, float x), ); # endif _GL_CXXALIAS_SYS (atan2f, float, (float y, float x)); # endif @@ -428,11 +428,11 @@ _GL_WARN_ON_USE (atan2f, "atan2f is unportable - " # undef cbrtf # define cbrtf rpl_cbrtf # endif -_GL_FUNCDECL_RPL (cbrtf, float, (float x)); +_GL_FUNCDECL_RPL (cbrtf, float, (float x), ); _GL_CXXALIAS_RPL (cbrtf, float, (float x)); # else # if !@HAVE_DECL_CBRTF@ -_GL_FUNCDECL_SYS (cbrtf, float, (float x)); +_GL_FUNCDECL_SYS (cbrtf, float, (float x), ); # endif _GL_CXXALIAS_SYS (cbrtf, float, (float x)); # endif @@ -447,7 +447,7 @@ _GL_WARN_ON_USE (cbrtf, "cbrtf is unportable - " #if @GNULIB_CBRT@ # if !@HAVE_CBRT@ -_GL_FUNCDECL_SYS (cbrt, double, (double x)); +_GL_FUNCDECL_SYS (cbrt, double, (double x), ); # endif _GL_CXXALIAS_SYS (cbrt, double, (double x)); # if __GLIBC__ >= 2 @@ -467,11 +467,11 @@ _GL_WARN_ON_USE (cbrt, "cbrt is unportable - " # undef cbrtl # define cbrtl rpl_cbrtl # endif -_GL_FUNCDECL_RPL (cbrtl, long double, (long double x)); +_GL_FUNCDECL_RPL (cbrtl, long double, (long double x), ); _GL_CXXALIAS_RPL (cbrtl, long double, (long double x)); # else # if !@HAVE_DECL_CBRTL@ -_GL_FUNCDECL_SYS (cbrtl, long double, (long double x)); +_GL_FUNCDECL_SYS (cbrtl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (cbrtl, long double, (long double x)); # endif @@ -493,12 +493,12 @@ _GL_WARN_ON_USE (cbrtl, "cbrtl is unportable - " # undef ceilf # define ceilf rpl_ceilf # endif -_GL_FUNCDECL_RPL (ceilf, float, (float x)); +_GL_FUNCDECL_RPL (ceilf, float, (float x), ); _GL_CXXALIAS_RPL (ceilf, float, (float x)); # else # if !@HAVE_DECL_CEILF@ # undef ceilf -_GL_FUNCDECL_SYS (ceilf, float, (float x)); +_GL_FUNCDECL_SYS (ceilf, float, (float x), ); # endif _GL_CXXALIAS_SYS (ceilf, float, (float x)); # endif @@ -517,7 +517,7 @@ _GL_WARN_ON_USE (ceilf, "ceilf is unportable - " # undef ceil # define ceil rpl_ceil # endif -_GL_FUNCDECL_RPL (ceil, double, (double x)); +_GL_FUNCDECL_RPL (ceil, double, (double x), ); _GL_CXXALIAS_RPL (ceil, double, (double x)); # else _GL_CXXALIAS_SYS (ceil, double, (double x)); @@ -533,12 +533,12 @@ _GL_CXXALIASWARN1 (ceil, double, (double x)); # undef ceill # define ceill rpl_ceill # endif -_GL_FUNCDECL_RPL (ceill, long double, (long double x)); +_GL_FUNCDECL_RPL (ceill, long double, (long double x), ); _GL_CXXALIAS_RPL (ceill, long double, (long double x)); # else # if !@HAVE_DECL_CEILL@ # undef ceill -_GL_FUNCDECL_SYS (ceill, long double, (long double x)); +_GL_FUNCDECL_SYS (ceill, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (ceill, long double, (long double x)); # endif @@ -557,7 +557,7 @@ _GL_WARN_ON_USE (ceill, "ceill is unportable - " #if @GNULIB_COPYSIGNF@ # if !@HAVE_DECL_COPYSIGNF@ # undef copysignf -_GL_FUNCDECL_SYS (copysignf, float, (float x, float y)); +_GL_FUNCDECL_SYS (copysignf, float, (float x, float y), ); # endif _GL_CXXALIAS_SYS (copysignf, float, (float x, float y)); _GL_CXXALIASWARN (copysignf); @@ -571,7 +571,7 @@ _GL_WARN_ON_USE (copysignf, "copysignf is unportable - " #if @GNULIB_COPYSIGN@ # if !@HAVE_COPYSIGN@ -_GL_FUNCDECL_SYS (copysign, double, (double x, double y)); +_GL_FUNCDECL_SYS (copysign, double, (double x, double y), ); # endif _GL_CXXALIAS_SYS (copysign, double, (double x, double y)); # if __GLIBC__ >= 2 @@ -587,7 +587,7 @@ _GL_WARN_ON_USE (copysign, "copysign is unportable - " #if @GNULIB_COPYSIGNL@ # if !@HAVE_COPYSIGNL@ -_GL_FUNCDECL_SYS (copysignl, long double, (long double x, long double y)); +_GL_FUNCDECL_SYS (copysignl, long double, (long double x, long double y), ); # endif _GL_CXXALIAS_SYS (copysignl, long double, (long double x, long double y)); # if __GLIBC__ >= 2 @@ -608,12 +608,12 @@ _GL_WARN_ON_USE (copysign, "copysignl is unportable - " # undef cosf # define cosf rpl_cosf # endif -_GL_FUNCDECL_RPL (cosf, float, (float x)); +_GL_FUNCDECL_RPL (cosf, float, (float x), ); _GL_CXXALIAS_RPL (cosf, float, (float x)); # else # if !@HAVE_COSF@ # undef cosf -_GL_FUNCDECL_SYS (cosf, float, (float x)); +_GL_FUNCDECL_SYS (cosf, float, (float x), ); # endif _GL_CXXALIAS_SYS (cosf, float, (float x)); # endif @@ -629,7 +629,7 @@ _GL_WARN_ON_USE (cosf, "cosf is unportable - " #if @GNULIB_COSL@ # if !@HAVE_COSL@ || !@HAVE_DECL_COSL@ # undef cosl -_GL_FUNCDECL_SYS (cosl, long double, (long double x)); +_GL_FUNCDECL_SYS (cosl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (cosl, long double, (long double x)); # if __GLIBC__ >= 2 @@ -650,12 +650,12 @@ _GL_WARN_ON_USE (cosl, "cosl is unportable - " # undef coshf # define coshf rpl_coshf # endif -_GL_FUNCDECL_RPL (coshf, float, (float x)); +_GL_FUNCDECL_RPL (coshf, float, (float x), ); _GL_CXXALIAS_RPL (coshf, float, (float x)); # else # if !@HAVE_COSHF@ # undef coshf -_GL_FUNCDECL_SYS (coshf, float, (float x)); +_GL_FUNCDECL_SYS (coshf, float, (float x), ); # endif _GL_CXXALIAS_SYS (coshf, float, (float x)); # endif @@ -675,12 +675,12 @@ _GL_WARN_ON_USE (coshf, "coshf is unportable - " # undef expf # define expf rpl_expf # endif -_GL_FUNCDECL_RPL (expf, float, (float x)); +_GL_FUNCDECL_RPL (expf, float, (float x), ); _GL_CXXALIAS_RPL (expf, float, (float x)); # else # if !@HAVE_EXPF@ # undef expf -_GL_FUNCDECL_SYS (expf, float, (float x)); +_GL_FUNCDECL_SYS (expf, float, (float x), ); # endif _GL_CXXALIAS_SYS (expf, float, (float x)); # endif @@ -699,12 +699,12 @@ _GL_WARN_ON_USE (expf, "expf is unportable - " # undef expl # define expl rpl_expl # endif -_GL_FUNCDECL_RPL (expl, long double, (long double x)); +_GL_FUNCDECL_RPL (expl, long double, (long double x), ); _GL_CXXALIAS_RPL (expl, long double, (long double x)); # else # if !@HAVE_EXPL@ || !@HAVE_DECL_EXPL@ # undef expl -_GL_FUNCDECL_SYS (expl, long double, (long double x)); +_GL_FUNCDECL_SYS (expl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (expl, long double, (long double x)); # endif @@ -722,7 +722,7 @@ _GL_WARN_ON_USE (expl, "expl is unportable - " #if @GNULIB_EXP2F@ # if !@HAVE_DECL_EXP2F@ -_GL_FUNCDECL_SYS (exp2f, float, (float x)); +_GL_FUNCDECL_SYS (exp2f, float, (float x), ); # endif _GL_CXXALIAS_SYS (exp2f, float, (float x)); _GL_CXXALIASWARN (exp2f); @@ -740,11 +740,11 @@ _GL_WARN_ON_USE (exp2f, "exp2f is unportable - " # undef exp2 # define exp2 rpl_exp2 # endif -_GL_FUNCDECL_RPL (exp2, double, (double x)); +_GL_FUNCDECL_RPL (exp2, double, (double x), ); _GL_CXXALIAS_RPL (exp2, double, (double x)); # else # if !@HAVE_DECL_EXP2@ -_GL_FUNCDECL_SYS (exp2, double, (double x)); +_GL_FUNCDECL_SYS (exp2, double, (double x), ); # endif _GL_CXXALIAS_SYS (exp2, double, (double x)); # endif @@ -765,12 +765,12 @@ _GL_WARN_ON_USE (exp2, "exp2 is unportable - " # undef exp2l # define exp2l rpl_exp2l # endif -_GL_FUNCDECL_RPL (exp2l, long double, (long double x)); +_GL_FUNCDECL_RPL (exp2l, long double, (long double x), ); _GL_CXXALIAS_RPL (exp2l, long double, (long double x)); # else # if !@HAVE_DECL_EXP2L@ # undef exp2l -_GL_FUNCDECL_SYS (exp2l, long double, (long double x)); +_GL_FUNCDECL_SYS (exp2l, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (exp2l, long double, (long double x)); # endif @@ -792,11 +792,11 @@ _GL_WARN_ON_USE (exp2l, "exp2l is unportable - " # undef expm1f # define expm1f rpl_expm1f # endif -_GL_FUNCDECL_RPL (expm1f, float, (float x)); +_GL_FUNCDECL_RPL (expm1f, float, (float x), ); _GL_CXXALIAS_RPL (expm1f, float, (float x)); # else # if !@HAVE_EXPM1F@ -_GL_FUNCDECL_SYS (expm1f, float, (float x)); +_GL_FUNCDECL_SYS (expm1f, float, (float x), ); # endif _GL_CXXALIAS_SYS (expm1f, float, (float x)); # endif @@ -815,11 +815,11 @@ _GL_WARN_ON_USE (expm1f, "expm1f is unportable - " # undef expm1 # define expm1 rpl_expm1 # endif -_GL_FUNCDECL_RPL (expm1, double, (double x)); +_GL_FUNCDECL_RPL (expm1, double, (double x), ); _GL_CXXALIAS_RPL (expm1, double, (double x)); # else # if !@HAVE_EXPM1@ -_GL_FUNCDECL_SYS (expm1, double, (double x)); +_GL_FUNCDECL_SYS (expm1, double, (double x), ); # endif _GL_CXXALIAS_SYS (expm1, double, (double x)); # endif @@ -840,13 +840,13 @@ _GL_WARN_ON_USE (expm1, "expm1 is unportable - " # undef expm1l # define expm1l rpl_expm1l # endif -_GL_FUNCDECL_RPL (expm1l, long double, (long double x)); +_GL_FUNCDECL_RPL (expm1l, long double, (long double x), ); _GL_CXXALIAS_RPL (expm1l, long double, (long double x)); # else # if !@HAVE_DECL_EXPM1L@ # undef expm1l # if !(defined __cplusplus && defined _AIX) -_GL_FUNCDECL_SYS (expm1l, long double, (long double x)); +_GL_FUNCDECL_SYS (expm1l, long double, (long double x), ); # endif # endif _GL_CXXALIAS_SYS (expm1l, long double, (long double x)); @@ -866,7 +866,7 @@ _GL_WARN_ON_USE (expm1l, "expm1l is unportable - " #if @GNULIB_FABSF@ # if !@HAVE_FABSF@ # undef fabsf -_GL_FUNCDECL_SYS (fabsf, float, (float x)); +_GL_FUNCDECL_SYS (fabsf, float, (float x), ); # endif _GL_CXXALIAS_SYS (fabsf, float, (float x)); # if __GLIBC__ >= 2 @@ -886,12 +886,12 @@ _GL_WARN_ON_USE (fabsf, "fabsf is unportable - " # undef fabsl # define fabsl rpl_fabsl # endif -_GL_FUNCDECL_RPL (fabsl, long double, (long double x)); +_GL_FUNCDECL_RPL (fabsl, long double, (long double x), ); _GL_CXXALIAS_RPL (fabsl, long double, (long double x)); # else # if !@HAVE_FABSL@ # undef fabsl -_GL_FUNCDECL_SYS (fabsl, long double, (long double x)); +_GL_FUNCDECL_SYS (fabsl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (fabsl, long double, (long double x)); # endif @@ -913,12 +913,12 @@ _GL_WARN_ON_USE (fabsl, "fabsl is unportable - " # undef floorf # define floorf rpl_floorf # endif -_GL_FUNCDECL_RPL (floorf, float, (float x)); +_GL_FUNCDECL_RPL (floorf, float, (float x), ); _GL_CXXALIAS_RPL (floorf, float, (float x)); # else # if !@HAVE_DECL_FLOORF@ # undef floorf -_GL_FUNCDECL_SYS (floorf, float, (float x)); +_GL_FUNCDECL_SYS (floorf, float, (float x), ); # endif _GL_CXXALIAS_SYS (floorf, float, (float x)); # endif @@ -937,7 +937,7 @@ _GL_WARN_ON_USE (floorf, "floorf is unportable - " # undef floor # define floor rpl_floor # endif -_GL_FUNCDECL_RPL (floor, double, (double x)); +_GL_FUNCDECL_RPL (floor, double, (double x), ); _GL_CXXALIAS_RPL (floor, double, (double x)); # else _GL_CXXALIAS_SYS (floor, double, (double x)); @@ -953,12 +953,12 @@ _GL_CXXALIASWARN1 (floor, double, (double x)); # undef floorl # define floorl rpl_floorl # endif -_GL_FUNCDECL_RPL (floorl, long double, (long double x)); +_GL_FUNCDECL_RPL (floorl, long double, (long double x), ); _GL_CXXALIAS_RPL (floorl, long double, (long double x)); # else # if !@HAVE_DECL_FLOORL@ # undef floorl -_GL_FUNCDECL_SYS (floorl, long double, (long double x)); +_GL_FUNCDECL_SYS (floorl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (floorl, long double, (long double x)); # endif @@ -980,12 +980,12 @@ _GL_WARN_ON_USE (floorl, "floorl is unportable - " # undef fmaf # define fmaf rpl_fmaf # endif -_GL_FUNCDECL_RPL (fmaf, float, (float x, float y, float z)); +_GL_FUNCDECL_RPL (fmaf, float, (float x, float y, float z), ); _GL_CXXALIAS_RPL (fmaf, float, (float x, float y, float z)); # else # if !@HAVE_FMAF@ # undef fmaf -_GL_FUNCDECL_SYS (fmaf, float, (float x, float y, float z)); +_GL_FUNCDECL_SYS (fmaf, float, (float x, float y, float z), ); # endif _GL_CXXALIAS_SYS (fmaf, float, (float x, float y, float z)); # endif @@ -1004,12 +1004,12 @@ _GL_WARN_ON_USE (fmaf, "fmaf is unportable - " # undef fma # define fma rpl_fma # endif -_GL_FUNCDECL_RPL (fma, double, (double x, double y, double z)); +_GL_FUNCDECL_RPL (fma, double, (double x, double y, double z), ); _GL_CXXALIAS_RPL (fma, double, (double x, double y, double z)); # else # if !@HAVE_FMA@ # undef fma -_GL_FUNCDECL_SYS (fma, double, (double x, double y, double z)); +_GL_FUNCDECL_SYS (fma, double, (double x, double y, double z), ); # endif _GL_CXXALIAS_SYS (fma, double, (double x, double y, double z)); # endif @@ -1031,7 +1031,7 @@ _GL_WARN_ON_USE (fma, "fma is unportable - " # define fmal rpl_fmal # endif _GL_FUNCDECL_RPL (fmal, long double, - (long double x, long double y, long double z)); + (long double x, long double y, long double z), ); _GL_CXXALIAS_RPL (fmal, long double, (long double x, long double y, long double z)); # else @@ -1039,7 +1039,7 @@ _GL_CXXALIAS_RPL (fmal, long double, # undef fmal # if !(defined __cplusplus && defined _AIX) _GL_FUNCDECL_SYS (fmal, long double, - (long double x, long double y, long double z)); + (long double x, long double y, long double z), ); # endif # endif _GL_CXXALIAS_SYS (fmal, long double, @@ -1063,12 +1063,12 @@ _GL_WARN_ON_USE (fmal, "fmal is unportable - " # undef fmodf # define fmodf rpl_fmodf # endif -_GL_FUNCDECL_RPL (fmodf, float, (float x, float y)); +_GL_FUNCDECL_RPL (fmodf, float, (float x, float y), ); _GL_CXXALIAS_RPL (fmodf, float, (float x, float y)); # else # if !@HAVE_FMODF@ # undef fmodf -_GL_FUNCDECL_SYS (fmodf, float, (float x, float y)); +_GL_FUNCDECL_SYS (fmodf, float, (float x, float y), ); # endif _GL_CXXALIAS_SYS (fmodf, float, (float x, float y)); # endif @@ -1087,7 +1087,7 @@ _GL_WARN_ON_USE (fmodf, "fmodf is unportable - " # undef fmod # define fmod rpl_fmod # endif -_GL_FUNCDECL_RPL (fmod, double, (double x, double y)); +_GL_FUNCDECL_RPL (fmod, double, (double x, double y), ); _GL_CXXALIAS_RPL (fmod, double, (double x, double y)); # else _GL_CXXALIAS_SYS (fmod, double, (double x, double y)); @@ -1109,12 +1109,12 @@ _GL_WARN_ON_USE (fmod, "fmod has portability problems - " # undef fmodl # define fmodl rpl_fmodl # endif -_GL_FUNCDECL_RPL (fmodl, long double, (long double x, long double y)); +_GL_FUNCDECL_RPL (fmodl, long double, (long double x, long double y), ); _GL_CXXALIAS_RPL (fmodl, long double, (long double x, long double y)); # else # if !@HAVE_FMODL@ # undef fmodl -_GL_FUNCDECL_SYS (fmodl, long double, (long double x, long double y)); +_GL_FUNCDECL_SYS (fmodl, long double, (long double x, long double y), ); # endif _GL_CXXALIAS_SYS (fmodl, long double, (long double x, long double y)); # endif @@ -1143,12 +1143,12 @@ _GL_WARN_ON_USE (fmodl, "fmodl is unportable - " # undef frexpf # define frexpf rpl_frexpf # endif -_GL_FUNCATTR_RPL (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCDECL_RPL (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (frexpf, float, (float x, int *expptr)); # else # if !@HAVE_FREXPF@ # undef frexpf -_GL_FUNCATTR_SYS (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCDECL_SYS (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (frexpf, float, (float x, int *expptr)); # endif @@ -1176,7 +1176,7 @@ _GL_WARN_ON_USE (frexpf, "frexpf is unportable - " # undef frexp # define frexp rpl_frexp # endif -_GL_FUNCATTR_RPL (frexp, double, (double x, int *expptr), +_GL_FUNCDECL_RPL (frexp, double, (double x, int *expptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (frexp, double, (double x, int *expptr)); # else @@ -1204,12 +1204,12 @@ _GL_WARN_ON_USE (frexp, "frexp is unportable - " # undef frexpl # define frexpl rpl_frexpl # endif -_GL_FUNCATTR_RPL (frexpl, long double, +_GL_FUNCDECL_RPL (frexpl, long double, (long double x, int *expptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (frexpl, long double, (long double x, int *expptr)); #else # if !@HAVE_DECL_FREXPL@ -_GL_FUNCATTR_SYS (frexpl, long double, +_GL_FUNCDECL_SYS (frexpl, long double, (long double x, int *expptr), _GL_ARG_NONNULL ((2))); # endif # if @GNULIB_FREXPL@ @@ -1237,11 +1237,11 @@ _GL_WARN_ON_USE (frexpl, "frexpl is unportable - " # undef hypotf # define hypotf rpl_hypotf # endif -_GL_FUNCDECL_RPL (hypotf, float, (float x, float y)); +_GL_FUNCDECL_RPL (hypotf, float, (float x, float y), ); _GL_CXXALIAS_RPL (hypotf, float, (float x, float y)); # else # if !@HAVE_HYPOTF@ -_GL_FUNCDECL_SYS (hypotf, float, (float x, float y)); +_GL_FUNCDECL_SYS (hypotf, float, (float x, float y), ); # endif _GL_CXXALIAS_SYS (hypotf, float, (float x, float y)); # endif @@ -1263,7 +1263,7 @@ _GL_WARN_ON_USE (hypotf, "hypotf is unportable - " # undef hypot # define hypot rpl_hypot # endif -_GL_FUNCDECL_RPL (hypot, double, (double x, double y)); +_GL_FUNCDECL_RPL (hypot, double, (double x, double y), ); _GL_CXXALIAS_RPL (hypot, double, (double x, double y)); # else _GL_CXXALIAS_SYS (hypot, double, (double x, double y)); @@ -1286,11 +1286,11 @@ _GL_WARN_ON_USE (hypotf, "hypot has portability problems - " # undef hypotl # define hypotl rpl_hypotl # endif -_GL_FUNCDECL_RPL (hypotl, long double, (long double x, long double y)); +_GL_FUNCDECL_RPL (hypotl, long double, (long double x, long double y), ); _GL_CXXALIAS_RPL (hypotl, long double, (long double x, long double y)); # else # if !@HAVE_HYPOTL@ -_GL_FUNCDECL_SYS (hypotl, long double, (long double x, long double y)); +_GL_FUNCDECL_SYS (hypotl, long double, (long double x, long double y), ); # endif _GL_CXXALIAS_SYS (hypotl, long double, (long double x, long double y)); # endif @@ -1312,11 +1312,11 @@ _GL_WARN_ON_USE (hypotl, "hypotl is unportable - " # undef ilogbf # define ilogbf rpl_ilogbf # endif -_GL_FUNCDECL_RPL (ilogbf, int, (float x)); +_GL_FUNCDECL_RPL (ilogbf, int, (float x), ); _GL_CXXALIAS_RPL (ilogbf, int, (float x)); # else # if !@HAVE_ILOGBF@ -_GL_FUNCDECL_SYS (ilogbf, int, (float x)); +_GL_FUNCDECL_SYS (ilogbf, int, (float x), ); # endif _GL_CXXALIAS_SYS (ilogbf, int, (float x)); # endif @@ -1335,11 +1335,11 @@ _GL_WARN_ON_USE (ilogbf, "ilogbf is unportable - " # undef ilogb # define ilogb rpl_ilogb # endif -_GL_FUNCDECL_RPL (ilogb, int, (double x)); +_GL_FUNCDECL_RPL (ilogb, int, (double x), ); _GL_CXXALIAS_RPL (ilogb, int, (double x)); # else # if !@HAVE_ILOGB@ -_GL_FUNCDECL_SYS (ilogb, int, (double x)); +_GL_FUNCDECL_SYS (ilogb, int, (double x), ); # endif _GL_CXXALIAS_SYS (ilogb, int, (double x)); # endif @@ -1360,12 +1360,12 @@ _GL_WARN_ON_USE (ilogb, "ilogb is unportable - " # undef ilogbl # define ilogbl rpl_ilogbl # endif -_GL_FUNCDECL_RPL (ilogbl, int, (long double x)); +_GL_FUNCDECL_RPL (ilogbl, int, (long double x), ); _GL_CXXALIAS_RPL (ilogbl, int, (long double x)); # else # if !@HAVE_ILOGBL@ # undef ilogbl -_GL_FUNCDECL_SYS (ilogbl, int, (long double x)); +_GL_FUNCDECL_SYS (ilogbl, int, (long double x), ); # endif _GL_CXXALIAS_SYS (ilogbl, int, (long double x)); # endif @@ -1434,7 +1434,7 @@ _GL_CXXALIASWARN (jn); #if @GNULIB_LDEXPF@ # if !@HAVE_LDEXPF@ # undef ldexpf -_GL_FUNCDECL_SYS (ldexpf, float, (float x, int exp)); +_GL_FUNCDECL_SYS (ldexpf, float, (float x, int exp), ); # endif _GL_CXXALIAS_SYS (ldexpf, float, (float x, int exp)); # if __GLIBC__ >= 2 @@ -1455,7 +1455,7 @@ _GL_WARN_ON_USE (ldexpf, "ldexpf is unportable - " # undef ldexp # define ldexp rpl_ldexp # endif -_GL_FUNCDECL_RPL (ldexp, double, (double x, int exp)); +_GL_FUNCDECL_RPL (ldexp, double, (double x, int exp), ); _GL_CXXALIAS_RPL (ldexp, double, (double x, int exp)); # else /* Assume ldexp is always declared. */ @@ -1477,11 +1477,11 @@ _GL_WARN_ON_USE (ldexp, "ldexp is unportable - " # undef ldexpl # define ldexpl rpl_ldexpl # endif -_GL_FUNCDECL_RPL (ldexpl, long double, (long double x, int exp)); +_GL_FUNCDECL_RPL (ldexpl, long double, (long double x, int exp), ); _GL_CXXALIAS_RPL (ldexpl, long double, (long double x, int exp)); #else # if !@HAVE_DECL_LDEXPL@ -_GL_FUNCDECL_SYS (ldexpl, long double, (long double x, int exp)); +_GL_FUNCDECL_SYS (ldexpl, long double, (long double x, int exp), ); # endif # if @GNULIB_LDEXPL@ _GL_CXXALIAS_SYS (ldexpl, long double, (long double x, int exp)); @@ -1507,12 +1507,12 @@ _GL_WARN_ON_USE (ldexpl, "ldexpl is unportable - " # undef logf # define logf rpl_logf # endif -_GL_FUNCDECL_RPL (logf, float, (float x)); +_GL_FUNCDECL_RPL (logf, float, (float x), ); _GL_CXXALIAS_RPL (logf, float, (float x)); # else # if !@HAVE_LOGF@ # undef logf -_GL_FUNCDECL_SYS (logf, float, (float x)); +_GL_FUNCDECL_SYS (logf, float, (float x), ); # endif _GL_CXXALIAS_SYS (logf, float, (float x)); # endif @@ -1531,7 +1531,7 @@ _GL_WARN_ON_USE (logf, "logf is unportable - " # undef log # define log rpl_log # endif -_GL_FUNCDECL_RPL (log, double, (double x)); +_GL_FUNCDECL_RPL (log, double, (double x), ); _GL_CXXALIAS_RPL (log, double, (double x)); # else _GL_CXXALIAS_SYS (log, double, (double x)); @@ -1553,12 +1553,12 @@ _GL_WARN_ON_USE (log, "log has portability problems - " # undef logl # define logl rpl_logl # endif -_GL_FUNCDECL_RPL (logl, long double, (long double x)); +_GL_FUNCDECL_RPL (logl, long double, (long double x), ); _GL_CXXALIAS_RPL (logl, long double, (long double x)); # else # if !@HAVE_LOGL@ || !@HAVE_DECL_LOGL@ # undef logl -_GL_FUNCDECL_SYS (logl, long double, (long double x)); +_GL_FUNCDECL_SYS (logl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (logl, long double, (long double x)); # endif @@ -1580,12 +1580,12 @@ _GL_WARN_ON_USE (logl, "logl is unportable - " # undef log10f # define log10f rpl_log10f # endif -_GL_FUNCDECL_RPL (log10f, float, (float x)); +_GL_FUNCDECL_RPL (log10f, float, (float x), ); _GL_CXXALIAS_RPL (log10f, float, (float x)); # else # if !@HAVE_LOG10F@ # undef log10f -_GL_FUNCDECL_SYS (log10f, float, (float x)); +_GL_FUNCDECL_SYS (log10f, float, (float x), ); # endif _GL_CXXALIAS_SYS (log10f, float, (float x)); # endif @@ -1604,7 +1604,7 @@ _GL_WARN_ON_USE (log10f, "log10f is unportable - " # undef log10 # define log10 rpl_log10 # endif -_GL_FUNCDECL_RPL (log10, double, (double x)); +_GL_FUNCDECL_RPL (log10, double, (double x), ); _GL_CXXALIAS_RPL (log10, double, (double x)); # else _GL_CXXALIAS_SYS (log10, double, (double x)); @@ -1626,12 +1626,12 @@ _GL_WARN_ON_USE (log10, "log10 has portability problems - " # undef log10l # define log10l rpl_log10l # endif -_GL_FUNCDECL_RPL (log10l, long double, (long double x)); +_GL_FUNCDECL_RPL (log10l, long double, (long double x), ); _GL_CXXALIAS_RPL (log10l, long double, (long double x)); # else # if !@HAVE_LOG10L@ || !@HAVE_DECL_LOG10L@ # undef log10l -_GL_FUNCDECL_SYS (log10l, long double, (long double x)); +_GL_FUNCDECL_SYS (log10l, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (log10l, long double, (long double x)); # endif @@ -1653,11 +1653,11 @@ _GL_WARN_ON_USE (log10l, "log10l is unportable - " # undef log1pf # define log1pf rpl_log1pf # endif -_GL_FUNCDECL_RPL (log1pf, float, (float x)); +_GL_FUNCDECL_RPL (log1pf, float, (float x), ); _GL_CXXALIAS_RPL (log1pf, float, (float x)); # else # if !@HAVE_LOG1PF@ -_GL_FUNCDECL_SYS (log1pf, float, (float x)); +_GL_FUNCDECL_SYS (log1pf, float, (float x), ); # endif _GL_CXXALIAS_SYS (log1pf, float, (float x)); # endif @@ -1676,11 +1676,11 @@ _GL_WARN_ON_USE (log1pf, "log1pf is unportable - " # undef log1p # define log1p rpl_log1p # endif -_GL_FUNCDECL_RPL (log1p, double, (double x)); +_GL_FUNCDECL_RPL (log1p, double, (double x), ); _GL_CXXALIAS_RPL (log1p, double, (double x)); # else # if !@HAVE_LOG1P@ -_GL_FUNCDECL_SYS (log1p, double, (double x)); +_GL_FUNCDECL_SYS (log1p, double, (double x), ); # endif _GL_CXXALIAS_SYS (log1p, double, (double x)); # endif @@ -1701,11 +1701,11 @@ _GL_WARN_ON_USE (log1p, "log1p has portability problems - " # undef log1pl # define log1pl rpl_log1pl # endif -_GL_FUNCDECL_RPL (log1pl, long double, (long double x)); +_GL_FUNCDECL_RPL (log1pl, long double, (long double x), ); _GL_CXXALIAS_RPL (log1pl, long double, (long double x)); # else # if !@HAVE_LOG1PL@ -_GL_FUNCDECL_SYS (log1pl, long double, (long double x)); +_GL_FUNCDECL_SYS (log1pl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (log1pl, long double, (long double x)); # endif @@ -1727,12 +1727,12 @@ _GL_WARN_ON_USE (log1pl, "log1pl has portability problems - " # undef log2f # define log2f rpl_log2f # endif -_GL_FUNCDECL_RPL (log2f, float, (float x)); +_GL_FUNCDECL_RPL (log2f, float, (float x), ); _GL_CXXALIAS_RPL (log2f, float, (float x)); # else # if !@HAVE_DECL_LOG2F@ # undef log2f -_GL_FUNCDECL_SYS (log2f, float, (float x)); +_GL_FUNCDECL_SYS (log2f, float, (float x), ); # endif _GL_CXXALIAS_SYS (log2f, float, (float x)); # endif @@ -1753,12 +1753,12 @@ _GL_WARN_ON_USE (log2f, "log2f is unportable - " # undef log2 # define log2 rpl_log2 # endif -_GL_FUNCDECL_RPL (log2, double, (double x)); +_GL_FUNCDECL_RPL (log2, double, (double x), ); _GL_CXXALIAS_RPL (log2, double, (double x)); # else # if !@HAVE_DECL_LOG2@ # undef log2 -_GL_FUNCDECL_SYS (log2, double, (double x)); +_GL_FUNCDECL_SYS (log2, double, (double x), ); # endif _GL_CXXALIAS_SYS (log2, double, (double x)); # endif @@ -1779,11 +1779,11 @@ _GL_WARN_ON_USE (log2, "log2 is unportable - " # undef log2l # define log2l rpl_log2l # endif -_GL_FUNCDECL_RPL (log2l, long double, (long double x)); +_GL_FUNCDECL_RPL (log2l, long double, (long double x), ); _GL_CXXALIAS_RPL (log2l, long double, (long double x)); # else # if !@HAVE_DECL_LOG2L@ -_GL_FUNCDECL_SYS (log2l, long double, (long double x)); +_GL_FUNCDECL_SYS (log2l, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (log2l, long double, (long double x)); # endif @@ -1805,11 +1805,11 @@ _GL_WARN_ON_USE (log2l, "log2l is unportable - " # undef logbf # define logbf rpl_logbf # endif -_GL_FUNCDECL_RPL (logbf, float, (float x)); +_GL_FUNCDECL_RPL (logbf, float, (float x), ); _GL_CXXALIAS_RPL (logbf, float, (float x)); # else # if !@HAVE_LOGBF@ -_GL_FUNCDECL_SYS (logbf, float, (float x)); +_GL_FUNCDECL_SYS (logbf, float, (float x), ); # endif _GL_CXXALIAS_SYS (logbf, float, (float x)); # endif @@ -1828,11 +1828,11 @@ _GL_WARN_ON_USE (logbf, "logbf is unportable - " # undef logb # define logb rpl_logb # endif -_GL_FUNCDECL_RPL (logb, double, (double x)); +_GL_FUNCDECL_RPL (logb, double, (double x), ); _GL_CXXALIAS_RPL (logb, double, (double x)); # else # if !@HAVE_DECL_LOGB@ -_GL_FUNCDECL_SYS (logb, double, (double x)); +_GL_FUNCDECL_SYS (logb, double, (double x), ); # endif _GL_CXXALIAS_SYS (logb, double, (double x)); # endif @@ -1853,11 +1853,11 @@ _GL_WARN_ON_USE (logb, "logb is unportable - " # undef logbl # define logbl rpl_logbl # endif -_GL_FUNCDECL_RPL (logbl, long double, (long double x)); +_GL_FUNCDECL_RPL (logbl, long double, (long double x), ); _GL_CXXALIAS_RPL (logbl, long double, (long double x)); # else # if !@HAVE_LOGBL@ -_GL_FUNCDECL_SYS (logbl, long double, (long double x)); +_GL_FUNCDECL_SYS (logbl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (logbl, long double, (long double x)); # endif @@ -1875,7 +1875,7 @@ _GL_WARN_ON_USE (logbl, "logbl is unportable - " #if @GNULIB_LOGP1F@ # if !@HAVE_LOGP1F@ -_GL_FUNCDECL_SYS (logp1f, float, (float x)); +_GL_FUNCDECL_SYS (logp1f, float, (float x), ); # endif _GL_CXXALIAS_SYS (logp1f, float, (float x)); # if __GLIBC__ >= 2 @@ -1891,7 +1891,7 @@ _GL_WARN_ON_USE (logp1f, "logp1f is unportable - " #if @GNULIB_LOGP1@ # if !@HAVE_LOGP1@ -_GL_FUNCDECL_SYS (logp1, double, (double x)); +_GL_FUNCDECL_SYS (logp1, double, (double x), ); # endif _GL_CXXALIAS_SYS (logp1, double, (double x)); # if __GLIBC__ >= 2 @@ -1907,7 +1907,7 @@ _GL_WARN_ON_USE (logp1, "logp1 is unportable - " #if @GNULIB_LOGP1L@ # if !@HAVE_LOGP1L@ -_GL_FUNCDECL_SYS (logp1l, long double, (long double x)); +_GL_FUNCDECL_SYS (logp1l, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (logp1l, long double, (long double x)); # if __GLIBC__ >= 2 @@ -1928,12 +1928,12 @@ _GL_WARN_ON_USE (logp1l, "logp1l is unportable - " # undef modff # define modff rpl_modff # endif -_GL_FUNCATTR_RPL (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCDECL_RPL (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (modff, float, (float x, float *iptr)); # else # if !@HAVE_MODFF@ # undef modff -_GL_FUNCATTR_SYS (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCDECL_SYS (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (modff, float, (float x, float *iptr)); # endif @@ -1952,7 +1952,7 @@ _GL_WARN_ON_USE (modff, "modff is unportable - " # undef modf # define modf rpl_modf # endif -_GL_FUNCATTR_RPL (modf, double, (double x, double *iptr), +_GL_FUNCDECL_RPL (modf, double, (double x, double *iptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (modf, double, (double x, double *iptr)); # else @@ -1975,13 +1975,13 @@ _GL_WARN_ON_USE (modf, "modf has portability problems - " # undef modfl # define modfl rpl_modfl # endif -_GL_FUNCATTR_RPL (modfl, long double, (long double x, long double *iptr), +_GL_FUNCDECL_RPL (modfl, long double, (long double x, long double *iptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (modfl, long double, (long double x, long double *iptr)); # else # if !@HAVE_MODFL@ # undef modfl -_GL_FUNCATTR_SYS (modfl, long double, (long double x, long double *iptr), +_GL_FUNCDECL_SYS (modfl, long double, (long double x, long double *iptr), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (modfl, long double, (long double x, long double *iptr)); @@ -2001,7 +2001,7 @@ _GL_WARN_ON_USE (modfl, "modfl is unportable - " #if @GNULIB_POWF@ # if !@HAVE_POWF@ # undef powf -_GL_FUNCDECL_SYS (powf, float, (float x, float y)); +_GL_FUNCDECL_SYS (powf, float, (float x, float y), ); # endif _GL_CXXALIAS_SYS (powf, float, (float x, float y)); _GL_CXXALIASWARN (powf); @@ -2020,11 +2020,11 @@ _GL_WARN_ON_USE (powf, "powf is unportable - " # undef remainderf # define remainderf rpl_remainderf # endif -_GL_FUNCDECL_RPL (remainderf, float, (float x, float y)); +_GL_FUNCDECL_RPL (remainderf, float, (float x, float y), ); _GL_CXXALIAS_RPL (remainderf, float, (float x, float y)); # else # if !@HAVE_REMAINDERF@ -_GL_FUNCDECL_SYS (remainderf, float, (float x, float y)); +_GL_FUNCDECL_SYS (remainderf, float, (float x, float y), ); # endif _GL_CXXALIAS_SYS (remainderf, float, (float x, float y)); # endif @@ -2043,11 +2043,11 @@ _GL_WARN_ON_USE (remainderf, "remainderf is unportable - " # undef remainder # define remainder rpl_remainder # endif -_GL_FUNCDECL_RPL (remainder, double, (double x, double y)); +_GL_FUNCDECL_RPL (remainder, double, (double x, double y), ); _GL_CXXALIAS_RPL (remainder, double, (double x, double y)); # else # if !@HAVE_REMAINDER@ || !@HAVE_DECL_REMAINDER@ -_GL_FUNCDECL_SYS (remainder, double, (double x, double y)); +_GL_FUNCDECL_SYS (remainder, double, (double x, double y), ); # endif _GL_CXXALIAS_SYS (remainder, double, (double x, double y)); # endif @@ -2068,13 +2068,13 @@ _GL_WARN_ON_USE (remainder, "remainder is unportable - " # undef remainderl # define remainderl rpl_remainderl # endif -_GL_FUNCDECL_RPL (remainderl, long double, (long double x, long double y)); +_GL_FUNCDECL_RPL (remainderl, long double, (long double x, long double y), ); _GL_CXXALIAS_RPL (remainderl, long double, (long double x, long double y)); # else # if !@HAVE_DECL_REMAINDERL@ # undef remainderl # if !(defined __cplusplus && defined _AIX) -_GL_FUNCDECL_SYS (remainderl, long double, (long double x, long double y)); +_GL_FUNCDECL_SYS (remainderl, long double, (long double x, long double y), ); # endif # endif _GL_CXXALIAS_SYS (remainderl, long double, (long double x, long double y)); @@ -2093,7 +2093,7 @@ _GL_WARN_ON_USE (remainderl, "remainderl is unportable - " #if @GNULIB_RINTF@ # if !@HAVE_DECL_RINTF@ -_GL_FUNCDECL_SYS (rintf, float, (float x)); +_GL_FUNCDECL_SYS (rintf, float, (float x), ); # endif _GL_CXXALIAS_SYS (rintf, float, (float x)); _GL_CXXALIASWARN (rintf); @@ -2107,7 +2107,7 @@ _GL_WARN_ON_USE (rintf, "rintf is unportable - " #if @GNULIB_RINT@ # if !@HAVE_RINT@ -_GL_FUNCDECL_SYS (rint, double, (double x)); +_GL_FUNCDECL_SYS (rint, double, (double x), ); # endif _GL_CXXALIAS_SYS (rint, double, (double x)); # if __GLIBC__ >= 2 @@ -2127,11 +2127,11 @@ _GL_WARN_ON_USE (rint, "rint is unportable - " # undef rintl # define rintl rpl_rintl # endif -_GL_FUNCDECL_RPL (rintl, long double, (long double x)); +_GL_FUNCDECL_RPL (rintl, long double, (long double x), ); _GL_CXXALIAS_RPL (rintl, long double, (long double x)); # else # if !@HAVE_RINTL@ -_GL_FUNCDECL_SYS (rintl, long double, (long double x)); +_GL_FUNCDECL_SYS (rintl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (rintl, long double, (long double x)); # endif @@ -2153,11 +2153,11 @@ _GL_WARN_ON_USE (rintl, "rintl is unportable - " # undef roundf # define roundf rpl_roundf # endif -_GL_FUNCDECL_RPL (roundf, float, (float x)); +_GL_FUNCDECL_RPL (roundf, float, (float x), ); _GL_CXXALIAS_RPL (roundf, float, (float x)); # else # if !@HAVE_DECL_ROUNDF@ -_GL_FUNCDECL_SYS (roundf, float, (float x)); +_GL_FUNCDECL_SYS (roundf, float, (float x), ); # endif _GL_CXXALIAS_SYS (roundf, float, (float x)); # endif @@ -2176,11 +2176,11 @@ _GL_WARN_ON_USE (roundf, "roundf is unportable - " # undef round # define round rpl_round # endif -_GL_FUNCDECL_RPL (round, double, (double x)); +_GL_FUNCDECL_RPL (round, double, (double x), ); _GL_CXXALIAS_RPL (round, double, (double x)); # else # if !@HAVE_DECL_ROUND@ -_GL_FUNCDECL_SYS (round, double, (double x)); +_GL_FUNCDECL_SYS (round, double, (double x), ); # endif _GL_CXXALIAS_SYS (round, double, (double x)); # endif @@ -2201,13 +2201,13 @@ _GL_WARN_ON_USE (round, "round is unportable - " # undef roundl # define roundl rpl_roundl # endif -_GL_FUNCDECL_RPL (roundl, long double, (long double x)); +_GL_FUNCDECL_RPL (roundl, long double, (long double x), ); _GL_CXXALIAS_RPL (roundl, long double, (long double x)); # else # if !@HAVE_DECL_ROUNDL@ # undef roundl # if !(defined __cplusplus && defined _AIX) -_GL_FUNCDECL_SYS (roundl, long double, (long double x)); +_GL_FUNCDECL_SYS (roundl, long double, (long double x), ); # endif # endif _GL_CXXALIAS_SYS (roundl, long double, (long double x)); @@ -2230,12 +2230,12 @@ _GL_WARN_ON_USE (roundl, "roundl is unportable - " # undef sinf # define sinf rpl_sinf # endif -_GL_FUNCDECL_RPL (sinf, float, (float x)); +_GL_FUNCDECL_RPL (sinf, float, (float x), ); _GL_CXXALIAS_RPL (sinf, float, (float x)); # else # if !@HAVE_SINF@ # undef sinf -_GL_FUNCDECL_SYS (sinf, float, (float x)); +_GL_FUNCDECL_SYS (sinf, float, (float x), ); # endif _GL_CXXALIAS_SYS (sinf, float, (float x)); # endif @@ -2251,7 +2251,7 @@ _GL_WARN_ON_USE (sinf, "sinf is unportable - " #if @GNULIB_SINL@ # if !@HAVE_SINL@ || !@HAVE_DECL_SINL@ # undef sinl -_GL_FUNCDECL_SYS (sinl, long double, (long double x)); +_GL_FUNCDECL_SYS (sinl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (sinl, long double, (long double x)); # if __GLIBC__ >= 2 @@ -2272,12 +2272,12 @@ _GL_WARN_ON_USE (sinl, "sinl is unportable - " # undef sinhf # define sinhf rpl_sinhf # endif -_GL_FUNCDECL_RPL (sinhf, float, (float x)); +_GL_FUNCDECL_RPL (sinhf, float, (float x), ); _GL_CXXALIAS_RPL (sinhf, float, (float x)); # else # if !@HAVE_SINHF@ # undef sinhf -_GL_FUNCDECL_SYS (sinhf, float, (float x)); +_GL_FUNCDECL_SYS (sinhf, float, (float x), ); # endif _GL_CXXALIAS_SYS (sinhf, float, (float x)); # endif @@ -2297,12 +2297,12 @@ _GL_WARN_ON_USE (sinhf, "sinhf is unportable - " # undef sqrtf # define sqrtf rpl_sqrtf # endif -_GL_FUNCDECL_RPL (sqrtf, float, (float x)); +_GL_FUNCDECL_RPL (sqrtf, float, (float x), ); _GL_CXXALIAS_RPL (sqrtf, float, (float x)); # else # if !@HAVE_SQRTF@ # undef sqrtf -_GL_FUNCDECL_SYS (sqrtf, float, (float x)); +_GL_FUNCDECL_SYS (sqrtf, float, (float x), ); # endif _GL_CXXALIAS_SYS (sqrtf, float, (float x)); # endif @@ -2321,12 +2321,12 @@ _GL_WARN_ON_USE (sqrtf, "sqrtf is unportable - " # undef sqrtl # define sqrtl rpl_sqrtl # endif -_GL_FUNCDECL_RPL (sqrtl, long double, (long double x)); +_GL_FUNCDECL_RPL (sqrtl, long double, (long double x), ); _GL_CXXALIAS_RPL (sqrtl, long double, (long double x)); # else # if !@HAVE_SQRTL@ || !@HAVE_DECL_SQRTL@ # undef sqrtl -_GL_FUNCDECL_SYS (sqrtl, long double, (long double x)); +_GL_FUNCDECL_SYS (sqrtl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (sqrtl, long double, (long double x)); # endif @@ -2348,12 +2348,12 @@ _GL_WARN_ON_USE (sqrtl, "sqrtl is unportable - " # undef tanf # define tanf rpl_tanf # endif -_GL_FUNCDECL_RPL (tanf, float, (float x)); +_GL_FUNCDECL_RPL (tanf, float, (float x), ); _GL_CXXALIAS_RPL (tanf, float, (float x)); # else # if !@HAVE_TANF@ # undef tanf -_GL_FUNCDECL_SYS (tanf, float, (float x)); +_GL_FUNCDECL_SYS (tanf, float, (float x), ); # endif _GL_CXXALIAS_SYS (tanf, float, (float x)); # endif @@ -2369,7 +2369,7 @@ _GL_WARN_ON_USE (tanf, "tanf is unportable - " #if @GNULIB_TANL@ # if !@HAVE_TANL@ || !@HAVE_DECL_TANL@ # undef tanl -_GL_FUNCDECL_SYS (tanl, long double, (long double x)); +_GL_FUNCDECL_SYS (tanl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (tanl, long double, (long double x)); # if __GLIBC__ >= 2 @@ -2390,12 +2390,12 @@ _GL_WARN_ON_USE (tanl, "tanl is unportable - " # undef tanhf # define tanhf rpl_tanhf # endif -_GL_FUNCDECL_RPL (tanhf, float, (float x)); +_GL_FUNCDECL_RPL (tanhf, float, (float x), ); _GL_CXXALIAS_RPL (tanhf, float, (float x)); # else # if !@HAVE_TANHF@ # undef tanhf -_GL_FUNCDECL_SYS (tanhf, float, (float x)); +_GL_FUNCDECL_SYS (tanhf, float, (float x), ); # endif _GL_CXXALIAS_SYS (tanhf, float, (float x)); # endif @@ -2415,11 +2415,11 @@ _GL_WARN_ON_USE (tanhf, "tanhf is unportable - " # undef truncf # define truncf rpl_truncf # endif -_GL_FUNCDECL_RPL (truncf, float, (float x)); +_GL_FUNCDECL_RPL (truncf, float, (float x), ); _GL_CXXALIAS_RPL (truncf, float, (float x)); # else # if !@HAVE_DECL_TRUNCF@ -_GL_FUNCDECL_SYS (truncf, float, (float x)); +_GL_FUNCDECL_SYS (truncf, float, (float x), ); # endif _GL_CXXALIAS_SYS (truncf, float, (float x)); # endif @@ -2438,11 +2438,11 @@ _GL_WARN_ON_USE (truncf, "truncf is unportable - " # undef trunc # define trunc rpl_trunc # endif -_GL_FUNCDECL_RPL (trunc, double, (double x)); +_GL_FUNCDECL_RPL (trunc, double, (double x), ); _GL_CXXALIAS_RPL (trunc, double, (double x)); # else # if !@HAVE_DECL_TRUNC@ -_GL_FUNCDECL_SYS (trunc, double, (double x)); +_GL_FUNCDECL_SYS (trunc, double, (double x), ); # endif _GL_CXXALIAS_SYS (trunc, double, (double x)); # endif @@ -2463,11 +2463,11 @@ _GL_WARN_ON_USE (trunc, "trunc is unportable - " # undef truncl # define truncl rpl_truncl # endif -_GL_FUNCDECL_RPL (truncl, long double, (long double x)); +_GL_FUNCDECL_RPL (truncl, long double, (long double x), ); _GL_CXXALIAS_RPL (truncl, long double, (long double x)); # else # if !@HAVE_DECL_TRUNCL@ -_GL_FUNCDECL_SYS (truncl, long double, (long double x)); +_GL_FUNCDECL_SYS (truncl, long double, (long double x), ); # endif _GL_CXXALIAS_SYS (truncl, long double, (long double x)); # endif @@ -2844,11 +2844,11 @@ _GL_WARN_REAL_FLOATING_DECL (signbit); # undef getpayloadf # define getpayloadf rpl_getpayloadf # endif -_GL_FUNCDECL_RPL (getpayloadf, float, (const float *)); +_GL_FUNCDECL_RPL (getpayloadf, float, (const float *), ); _GL_CXXALIAS_RPL (getpayloadf, float, (const float *)); # else # if !@HAVE_GETPAYLOADF@ -_GL_FUNCDECL_SYS (getpayloadf, float, (const float *)); +_GL_FUNCDECL_SYS (getpayloadf, float, (const float *), ); # endif _GL_CXXALIAS_SYS (getpayloadf, float, (const float *)); # endif @@ -2867,11 +2867,11 @@ _GL_WARN_ON_USE (getpayloadf, "getpayloadf is unportable - " # undef getpayload # define getpayload rpl_getpayload # endif -_GL_FUNCDECL_RPL (getpayload, double, (const double *)); +_GL_FUNCDECL_RPL (getpayload, double, (const double *), ); _GL_CXXALIAS_RPL (getpayload, double, (const double *)); # else # if !@HAVE_GETPAYLOAD@ -_GL_FUNCDECL_SYS (getpayload, double, (const double *)); +_GL_FUNCDECL_SYS (getpayload, double, (const double *), ); # endif _GL_CXXALIAS_SYS (getpayload, double, (const double *)); # endif @@ -2890,11 +2890,11 @@ _GL_WARN_ON_USE (getpayload, "getpayload is unportable - " # undef getpayloadl # define getpayloadl rpl_getpayloadl # endif -_GL_FUNCDECL_RPL (getpayloadl, long double, (const long double *)); +_GL_FUNCDECL_RPL (getpayloadl, long double, (const long double *), ); _GL_CXXALIAS_RPL (getpayloadl, long double, (const long double *)); # else # if !@HAVE_GETPAYLOADL@ -_GL_FUNCDECL_SYS (getpayloadl, long double, (const long double *)); +_GL_FUNCDECL_SYS (getpayloadl, long double, (const long double *), ); # endif _GL_CXXALIAS_SYS (getpayloadl, long double, (const long double *)); # endif @@ -2910,7 +2910,7 @@ _GL_WARN_ON_USE (getpayloadl, "getpayloadl is unportable - " #if @GNULIB_SETPAYLOADF@ # if !@HAVE_SETPAYLOADF@ -_GL_FUNCDECL_SYS (setpayloadf, int, (float *, float)); +_GL_FUNCDECL_SYS (setpayloadf, int, (float *, float), ); # endif _GL_CXXALIAS_SYS (setpayloadf, int, (float *, float)); _GL_CXXALIASWARN (setpayloadf); @@ -2924,7 +2924,7 @@ _GL_WARN_ON_USE (setpayloadf, "setpayloadf is unportable - " #if @GNULIB_SETPAYLOAD@ # if !@HAVE_SETPAYLOAD@ -_GL_FUNCDECL_SYS (setpayload, int, (double *, double)); +_GL_FUNCDECL_SYS (setpayload, int, (double *, double), ); # endif _GL_CXXALIAS_SYS (setpayload, int, (double *, double)); _GL_CXXALIASWARN (setpayload); @@ -2938,7 +2938,7 @@ _GL_WARN_ON_USE (setpayload, "setpayload is unportable - " #if @GNULIB_SETPAYLOADL@ # if !@HAVE_SETPAYLOADL@ -_GL_FUNCDECL_SYS (setpayloadl, int, (long double *, long double)); +_GL_FUNCDECL_SYS (setpayloadl, int, (long double *, long double), ); # endif _GL_CXXALIAS_SYS (setpayloadl, int, (long double *, long double)); _GL_CXXALIASWARN (setpayloadl); @@ -2953,7 +2953,7 @@ _GL_WARN_ON_USE (setpayloadl, "setpayloadl is unportable - " #if @GNULIB_SETPAYLOADSIGF@ # if !@HAVE_SETPAYLOADSIGF@ -_GL_FUNCDECL_SYS (setpayloadsigf, int, (float *, float)); +_GL_FUNCDECL_SYS (setpayloadsigf, int, (float *, float), ); # endif _GL_CXXALIAS_SYS (setpayloadsigf, int, (float *, float)); _GL_CXXALIASWARN (setpayloadsigf); @@ -2967,7 +2967,7 @@ _GL_WARN_ON_USE (setpayloadsigf, "setpayloadsigf is unportable - " #if @GNULIB_SETPAYLOADSIG@ # if !@HAVE_SETPAYLOADSIG@ -_GL_FUNCDECL_SYS (setpayloadsig, int, (double *, double)); +_GL_FUNCDECL_SYS (setpayloadsig, int, (double *, double), ); # endif _GL_CXXALIAS_SYS (setpayloadsig, int, (double *, double)); _GL_CXXALIASWARN (setpayloadsig); @@ -2981,7 +2981,7 @@ _GL_WARN_ON_USE (setpayloadsig, "setpayloadsig is unportable - " #if @GNULIB_SETPAYLOADSIGL@ # if !@HAVE_SETPAYLOADSIGL@ -_GL_FUNCDECL_SYS (setpayloadsigl, int, (long double *, long double)); +_GL_FUNCDECL_SYS (setpayloadsigl, int, (long double *, long double), ); # endif _GL_CXXALIAS_SYS (setpayloadsigl, int, (long double *, long double)); _GL_CXXALIASWARN (setpayloadsigl); @@ -3000,11 +3000,11 @@ _GL_WARN_ON_USE (setpayloadsigl, "setpayloadsigl is unportable - " # undef totalorderf # define totalorderf rpl_totalorderf # endif -_GL_FUNCDECL_RPL (totalorderf, int, (float const *, float const *)); +_GL_FUNCDECL_RPL (totalorderf, int, (float const *, float const *), ); _GL_CXXALIAS_RPL (totalorderf, int, (float const *, float const *)); # else # if !@HAVE_TOTALORDERF@ -_GL_FUNCDECL_SYS (totalorderf, int, (float const *, float const *)); +_GL_FUNCDECL_SYS (totalorderf, int, (float const *, float const *), ); # endif _GL_CXXALIAS_SYS (totalorderf, int, (float const *, float const *)); # endif @@ -3023,11 +3023,11 @@ _GL_WARN_ON_USE (totalorderf, "totalorderf is unportable - " # undef totalorder # define totalorder rpl_totalorder # endif -_GL_FUNCDECL_RPL (totalorder, int, (double const *, double const *)); +_GL_FUNCDECL_RPL (totalorder, int, (double const *, double const *), ); _GL_CXXALIAS_RPL (totalorder, int, (double const *, double const *)); # else # if !@HAVE_TOTALORDER@ -_GL_FUNCDECL_SYS (totalorder, int, (double const *, double const *)); +_GL_FUNCDECL_SYS (totalorder, int, (double const *, double const *), ); # endif _GL_CXXALIAS_SYS (totalorder, int, (double const *, double const *)); # endif @@ -3049,13 +3049,13 @@ _GL_WARN_ON_USE (totalorder, "totalorder is unportable - " # define totalorderl rpl_totalorderl # endif _GL_FUNCDECL_RPL (totalorderl, int, - (long double const *, long double const *)); + (long double const *, long double const *), ); _GL_CXXALIAS_RPL (totalorderl, int, (long double const *, long double const *)); # else # if !@HAVE_TOTALORDERL@ _GL_FUNCDECL_SYS (totalorderl, int, - (long double const *, long double const *)); + (long double const *, long double const *), ); # endif _GL_CXXALIAS_SYS (totalorderl, int, (long double const *, long double const *)); @@ -3076,11 +3076,11 @@ _GL_WARN_ON_USE (totalorderl, "totalorderl is unportable - " # undef totalordermagf # define totalordermagf rpl_totalordermagf # endif -_GL_FUNCDECL_RPL (totalordermagf, int, (float const *, float const *)); +_GL_FUNCDECL_RPL (totalordermagf, int, (float const *, float const *), ); _GL_CXXALIAS_RPL (totalordermagf, int, (float const *, float const *)); # else # if !@HAVE_TOTALORDERMAGF@ -_GL_FUNCDECL_SYS (totalordermagf, int, (float const *, float const *)); +_GL_FUNCDECL_SYS (totalordermagf, int, (float const *, float const *), ); # endif _GL_CXXALIAS_SYS (totalordermagf, int, (float const *, float const *)); # endif @@ -3101,11 +3101,11 @@ _GL_WARN_ON_USE (totalordermagf, "totalordermagf is unportable - " # undef totalordermag # define totalordermag rpl_totalordermag # endif -_GL_FUNCDECL_RPL (totalordermag, int, (double const *, double const *)); +_GL_FUNCDECL_RPL (totalordermag, int, (double const *, double const *), ); _GL_CXXALIAS_RPL (totalordermag, int, (double const *, double const *)); # else # if !@HAVE_TOTALORDERMAG@ -_GL_FUNCDECL_SYS (totalordermag, int, (double const *, double const *)); +_GL_FUNCDECL_SYS (totalordermag, int, (double const *, double const *), ); # endif _GL_CXXALIAS_SYS (totalordermag, int, (double const *, double const *)); # endif @@ -3127,13 +3127,13 @@ _GL_WARN_ON_USE (totalordermag, "totalordermag is unportable - " # define totalordermagl rpl_totalordermagl # endif _GL_FUNCDECL_RPL (totalordermagl, int, - (long double const *, long double const *)); + (long double const *, long double const *), ); _GL_CXXALIAS_RPL (totalordermagl, int, (long double const *, long double const *)); # else # if !@HAVE_TOTALORDERMAGL@ _GL_FUNCDECL_SYS (totalordermagl, int, - (long double const *, long double const *)); + (long double const *, long double const *), ); # endif _GL_CXXALIAS_SYS (totalordermagl, int, (long double const *, long double const *)); diff --git a/lib/mntent.in.h b/lib/mntent.in.h index 61693a8152..c8750fec66 100644 --- a/lib/mntent.in.h +++ b/lib/mntent.in.h @@ -52,14 +52,14 @@ extern "C" { # undef hasmntopt # define hasmntopt rpl_hasmntopt # endif -_GL_FUNCATTR_RPL (hasmntopt, char *, +_GL_FUNCDECL_RPL (hasmntopt, char *, (const struct mntent *me, const char *option), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (hasmntopt, char *, (const struct mntent *me, const char *option)); # else # if !@HAVE_HASMNTOPT@ -_GL_FUNCATTR_SYS (hasmntopt, char *, +_GL_FUNCDECL_SYS (hasmntopt, char *, (const struct mntent *me, const char *option), _GL_ARG_NONNULL ((1, 2))); # endif diff --git a/lib/monetary.in.h b/lib/monetary.in.h index 4093fae07c..63732673cc 100644 --- a/lib/monetary.in.h +++ b/lib/monetary.in.h @@ -86,7 +86,7 @@ extern "C" { # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strfmon_l rpl_strfmon_l # endif -_GL_FUNCATTR_RPL (strfmon_l, ssize_t, +_GL_FUNCDECL_RPL (strfmon_l, ssize_t, (char *restrict s, size_t maxsize, locale_t locale, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_STRFMON (4, 5) diff --git a/lib/netdb.in.h b/lib/netdb.in.h index 4f8316e92e..329dd15691 100644 --- a/lib/netdb.in.h +++ b/lib/netdb.in.h @@ -180,7 +180,7 @@ struct addrinfo # undef getaddrinfo # define getaddrinfo rpl_getaddrinfo # endif -_GL_FUNCATTR_RPL (getaddrinfo, int, +_GL_FUNCDECL_RPL (getaddrinfo, int, (const char *restrict nodename, const char *restrict servname, const struct addrinfo *restrict hints, @@ -193,7 +193,7 @@ _GL_CXXALIAS_RPL (getaddrinfo, int, struct addrinfo **restrict res)); # else # if !@HAVE_DECL_GETADDRINFO@ -_GL_FUNCATTR_SYS (getaddrinfo, int, +_GL_FUNCDECL_SYS (getaddrinfo, int, (const char *restrict nodename, const char *restrict servname, const struct addrinfo *restrict hints, @@ -216,12 +216,12 @@ _GL_CXXALIASWARN (getaddrinfo); # undef freeaddrinfo # define freeaddrinfo rpl_freeaddrinfo # endif -_GL_FUNCATTR_RPL (freeaddrinfo, void, (struct addrinfo *ai), +_GL_FUNCDECL_RPL (freeaddrinfo, void, (struct addrinfo *ai), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (freeaddrinfo, void, (struct addrinfo *ai)); # else # if !@HAVE_DECL_FREEADDRINFO@ -_GL_FUNCATTR_SYS (freeaddrinfo, void, (struct addrinfo *ai), +_GL_FUNCDECL_SYS (freeaddrinfo, void, (struct addrinfo *ai), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (freeaddrinfo, void, (struct addrinfo *ai)); @@ -233,14 +233,14 @@ _GL_CXXALIASWARN (freeaddrinfo); # undef gai_strerror # define gai_strerror rpl_gai_strerror # endif -_GL_FUNCDECL_RPL (gai_strerror, const char *, (int ecode)); +_GL_FUNCDECL_RPL (gai_strerror, const char *, (int ecode), ); _GL_CXXALIAS_RPL (gai_strerror, const char *, (int ecode)); # else # if !@HAVE_DECL_GAI_STRERROR@ /* Convert error return from getaddrinfo() to a string. For more details, see the POSIX:2008 specification . */ -_GL_FUNCDECL_SYS (gai_strerror, const char *, (int ecode)); +_GL_FUNCDECL_SYS (gai_strerror, const char *, (int ecode), ); # endif _GL_CXXALIAS_SYS (gai_strerror, const char *, (int ecode)); # endif @@ -252,7 +252,7 @@ _GL_CXXALIASWARN (gai_strerror); /* Convert socket address to printable node and service names. For more details, see the POSIX:2008 specification . */ -_GL_FUNCATTR_SYS (getnameinfo, int, +_GL_FUNCDECL_SYS (getnameinfo, int, (const struct sockaddr *restrict sa, socklen_t salen, char *restrict node, socklen_t nodelen, char *restrict service, socklen_t servicelen, diff --git a/lib/poll.in.h b/lib/poll.in.h index 61be6f3e77..29b2d26150 100644 --- a/lib/poll.in.h +++ b/lib/poll.in.h @@ -108,11 +108,11 @@ typedef unsigned long nfds_t; # undef poll # define poll rpl_poll # endif -_GL_FUNCDECL_RPL (poll, int, (struct pollfd *pfd, nfds_t nfd, int timeout)); +_GL_FUNCDECL_RPL (poll, int, (struct pollfd *pfd, nfds_t nfd, int timeout), ); _GL_CXXALIAS_RPL (poll, int, (struct pollfd *pfd, nfds_t nfd, int timeout)); # else # if !@HAVE_POLL@ -_GL_FUNCDECL_SYS (poll, int, (struct pollfd *pfd, nfds_t nfd, int timeout)); +_GL_FUNCDECL_SYS (poll, int, (struct pollfd *pfd, nfds_t nfd, int timeout), ); # endif _GL_CXXALIAS_SYS (poll, int, (struct pollfd *pfd, nfds_t nfd, int timeout)); # endif diff --git a/lib/pthread.in.h b/lib/pthread.in.h index 4a44c9a998..80081da7a7 100644 --- a/lib/pthread.in.h +++ b/lib/pthread.in.h @@ -496,7 +496,7 @@ typedef unsigned int pthread_barrierattr_t; # undef pthread_create # define pthread_create rpl_pthread_create # endif -_GL_FUNCATTR_RPL (pthread_create, int, +_GL_FUNCDECL_RPL (pthread_create, int, (pthread_t *restrict threadp, const pthread_attr_t *restrict attr, void * (*mainfunc) (void *), void *restrict arg), @@ -507,7 +507,7 @@ _GL_CXXALIAS_RPL (pthread_create, int, void * (*mainfunc) (void *), void *restrict arg)); # else # if !@HAVE_PTHREAD_CREATE@ -_GL_FUNCATTR_SYS (pthread_create, int, +_GL_FUNCDECL_SYS (pthread_create, int, (pthread_t *restrict threadp, const pthread_attr_t *restrict attr, void * (*mainfunc) (void *), void *restrict arg), @@ -535,12 +535,12 @@ _GL_WARN_ON_USE (pthread_create, "pthread_create is not portable - " # undef pthread_attr_init # define pthread_attr_init rpl_pthread_attr_init # endif -_GL_FUNCATTR_RPL (pthread_attr_init, int, (pthread_attr_t *attr), +_GL_FUNCDECL_RPL (pthread_attr_init, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_attr_init, int, (pthread_attr_t *attr)); # else # if !@HAVE_PTHREAD_ATTR_INIT@ -_GL_FUNCATTR_SYS (pthread_attr_init, int, (pthread_attr_t *attr), +_GL_FUNCDECL_SYS (pthread_attr_init, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_attr_init, int, (pthread_attr_t *attr)); @@ -562,14 +562,14 @@ _GL_WARN_ON_USE (pthread_attr_init, "pthread_attr_init is not portable - " # undef pthread_attr_getdetachstate # define pthread_attr_getdetachstate rpl_pthread_attr_getdetachstate # endif -_GL_FUNCATTR_RPL (pthread_attr_getdetachstate, int, +_GL_FUNCDECL_RPL (pthread_attr_getdetachstate, int, (const pthread_attr_t *attr, int *detachstatep), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (pthread_attr_getdetachstate, int, (const pthread_attr_t *attr, int *detachstatep)); # else # if !@HAVE_PTHREAD_ATTR_GETDETACHSTATE@ -_GL_FUNCATTR_SYS (pthread_attr_getdetachstate, int, +_GL_FUNCDECL_SYS (pthread_attr_getdetachstate, int, (const pthread_attr_t *attr, int *detachstatep), _GL_ARG_NONNULL ((1, 2))); # endif @@ -593,14 +593,14 @@ _GL_WARN_ON_USE (pthread_attr_getdetachstate, "pthread_attr_getdetachstate is no # undef pthread_attr_setdetachstate # define pthread_attr_setdetachstate rpl_pthread_attr_setdetachstate # endif -_GL_FUNCATTR_RPL (pthread_attr_setdetachstate, int, +_GL_FUNCDECL_RPL (pthread_attr_setdetachstate, int, (pthread_attr_t *attr, int detachstate), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_attr_setdetachstate, int, (pthread_attr_t *attr, int detachstate)); # else # if !@HAVE_PTHREAD_ATTR_SETDETACHSTATE@ -_GL_FUNCATTR_SYS (pthread_attr_setdetachstate, int, +_GL_FUNCDECL_SYS (pthread_attr_setdetachstate, int, (pthread_attr_t *attr, int detachstate), _GL_ARG_NONNULL ((1))); # endif @@ -624,12 +624,12 @@ _GL_WARN_ON_USE (pthread_attr_setdetachstate, "pthread_attr_setdetachstate is no # undef pthread_attr_destroy # define pthread_attr_destroy rpl_pthread_attr_destroy # endif -_GL_FUNCATTR_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr), +_GL_FUNCDECL_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr)); # else # if !@HAVE_PTHREAD_ATTR_DESTROY@ -_GL_FUNCATTR_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr), +_GL_FUNCDECL_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr)); @@ -651,11 +651,11 @@ _GL_WARN_ON_USE (pthread_attr_destroy, "pthread_attr_destroy is not portable - " # undef pthread_self # define pthread_self rpl_pthread_self # endif -_GL_FUNCATTR_RPL (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_RPL (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (pthread_self, pthread_t, (void)); # else # if !@HAVE_PTHREAD_SELF@ -_GL_FUNCATTR_SYS (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (pthread_self, pthread_t, (void)); # endif @@ -676,11 +676,11 @@ _GL_WARN_ON_USE (pthread_self, "pthread_self is not portable - " # undef pthread_equal # define pthread_equal rpl_pthread_equal # endif -_GL_FUNCDECL_RPL (pthread_equal, int, (pthread_t thread1, pthread_t thread2)); +_GL_FUNCDECL_RPL (pthread_equal, int, (pthread_t thread1, pthread_t thread2), ); _GL_CXXALIAS_RPL (pthread_equal, int, (pthread_t thread1, pthread_t thread2)); # else # if !@HAVE_PTHREAD_EQUAL@ -_GL_FUNCDECL_SYS (pthread_equal, int, (pthread_t thread1, pthread_t thread2)); +_GL_FUNCDECL_SYS (pthread_equal, int, (pthread_t thread1, pthread_t thread2), ); # endif _GL_CXXALIAS_SYS (pthread_equal, int, (pthread_t thread1, pthread_t thread2)); # endif @@ -701,11 +701,11 @@ _GL_WARN_ON_USE (pthread_equal, "pthread_equal is not portable - " # undef pthread_detach # define pthread_detach rpl_pthread_detach # endif -_GL_FUNCDECL_RPL (pthread_detach, int, (pthread_t thread)); +_GL_FUNCDECL_RPL (pthread_detach, int, (pthread_t thread), ); _GL_CXXALIAS_RPL (pthread_detach, int, (pthread_t thread)); # else # if !@HAVE_PTHREAD_DETACH@ -_GL_FUNCDECL_SYS (pthread_detach, int, (pthread_t thread)); +_GL_FUNCDECL_SYS (pthread_detach, int, (pthread_t thread), ); # endif _GL_CXXALIAS_SYS (pthread_detach, int, (pthread_t thread)); # endif @@ -726,11 +726,11 @@ _GL_WARN_ON_USE (pthread_detach, "pthread_detach is not portable - " # undef pthread_join # define pthread_join rpl_pthread_join # endif -_GL_FUNCDECL_RPL (pthread_join, int, (pthread_t thread, void **valuep)); +_GL_FUNCDECL_RPL (pthread_join, int, (pthread_t thread, void **valuep), ); _GL_CXXALIAS_RPL (pthread_join, int, (pthread_t thread, void **valuep)); # else # if !@HAVE_PTHREAD_JOIN@ -_GL_FUNCDECL_SYS (pthread_join, int, (pthread_t thread, void **valuep)); +_GL_FUNCDECL_SYS (pthread_join, int, (pthread_t thread, void **valuep), ); # endif _GL_CXXALIAS_SYS (pthread_join, int, (pthread_t thread, void **valuep)); # endif @@ -751,11 +751,11 @@ _GL_WARN_ON_USE (pthread_join, "pthread_join is not portable - " # undef pthread_exit # define pthread_exit rpl_pthread_exit # endif -_GL_FUNCDECL_RPL (pthread_exit, _Noreturn void, (void *value)); +_GL_FUNCDECL_RPL (pthread_exit, _Noreturn void, (void *value), ); _GL_CXXALIAS_RPL (pthread_exit, void, (void *value)); # else # if !@HAVE_PTHREAD_EXIT@ -_GL_FUNCDECL_SYS (pthread_exit, _Noreturn void, (void *value)); +_GL_FUNCDECL_SYS (pthread_exit, _Noreturn void, (void *value), ); # endif /* Need to cast because of AIX with xlclang++. */ _GL_CXXALIAS_SYS_CAST (pthread_exit, void, (void *value)); @@ -779,14 +779,14 @@ _GL_WARN_ON_USE (pthread_exit, "pthread_exit is not portable - " # undef pthread_once # define pthread_once rpl_pthread_once # endif -_GL_FUNCATTR_RPL (pthread_once, int, +_GL_FUNCDECL_RPL (pthread_once, int, (pthread_once_t *once_control, void (*initfunction) (void)), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (pthread_once, int, (pthread_once_t *once_control, void (*initfunction) (void))); # else # if !@HAVE_PTHREAD_ONCE@ -_GL_FUNCATTR_SYS (pthread_once, int, +_GL_FUNCDECL_SYS (pthread_once, int, (pthread_once_t *once_control, void (*initfunction) (void)), _GL_ARG_NONNULL ((1, 2))); # endif @@ -813,7 +813,7 @@ _GL_WARN_ON_USE (pthread_once, "pthread_once is not portable - " # undef pthread_mutex_init # define pthread_mutex_init rpl_pthread_mutex_init # endif -_GL_FUNCATTR_RPL (pthread_mutex_init, int, +_GL_FUNCDECL_RPL (pthread_mutex_init, int, (pthread_mutex_t *restrict mutex, const pthread_mutexattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -822,7 +822,7 @@ _GL_CXXALIAS_RPL (pthread_mutex_init, int, const pthread_mutexattr_t *restrict attr)); # else # if !@HAVE_PTHREAD_MUTEX_INIT@ -_GL_FUNCATTR_SYS (pthread_mutex_init, int, +_GL_FUNCDECL_SYS (pthread_mutex_init, int, (pthread_mutex_t *restrict mutex, const pthread_mutexattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -848,12 +848,12 @@ _GL_WARN_ON_USE (pthread_mutex_init, "pthread_mutex_init is not portable - " # undef pthread_mutexattr_init # define pthread_mutexattr_init rpl_pthread_mutexattr_init # endif -_GL_FUNCATTR_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), +_GL_FUNCDECL_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr)); # else # if !@HAVE_PTHREAD_MUTEXATTR_INIT@ -_GL_FUNCATTR_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), +_GL_FUNCDECL_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr)); @@ -875,7 +875,7 @@ _GL_WARN_ON_USE (pthread_mutexattr_init, "pthread_mutexattr_init is not portable # undef pthread_mutexattr_gettype # define pthread_mutexattr_gettype rpl_pthread_mutexattr_gettype # endif -_GL_FUNCATTR_RPL (pthread_mutexattr_gettype, int, +_GL_FUNCDECL_RPL (pthread_mutexattr_gettype, int, (const pthread_mutexattr_t *restrict attr, int *restrict typep), _GL_ARG_NONNULL ((1, 2))); @@ -884,7 +884,7 @@ _GL_CXXALIAS_RPL (pthread_mutexattr_gettype, int, int *restrict typep)); # else # if !@HAVE_PTHREAD_MUTEXATTR_GETTYPE@ -_GL_FUNCATTR_SYS (pthread_mutexattr_gettype, int, +_GL_FUNCDECL_SYS (pthread_mutexattr_gettype, int, (const pthread_mutexattr_t *restrict attr, int *restrict typep), _GL_ARG_NONNULL ((1, 2))); @@ -912,13 +912,13 @@ _GL_WARN_ON_USE (pthread_mutexattr_gettype, "pthread_mutexattr_gettype is not po # undef pthread_mutexattr_settype # define pthread_mutexattr_settype rpl_pthread_mutexattr_settype # endif -_GL_FUNCATTR_RPL (pthread_mutexattr_settype, int, +_GL_FUNCDECL_RPL (pthread_mutexattr_settype, int, (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_settype, int, (pthread_mutexattr_t *attr, int type)); # else # if !@HAVE_PTHREAD_MUTEXATTR_SETTYPE@ -_GL_FUNCATTR_SYS (pthread_mutexattr_settype, int, +_GL_FUNCDECL_SYS (pthread_mutexattr_settype, int, (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutexattr_settype, int, @@ -941,7 +941,7 @@ _GL_WARN_ON_USE (pthread_mutexattr_settype, "pthread_mutexattr_settype is not po # undef pthread_mutexattr_getrobust # define pthread_mutexattr_getrobust rpl_pthread_mutexattr_getrobust # endif -_GL_FUNCATTR_RPL (pthread_mutexattr_getrobust, int, +_GL_FUNCDECL_RPL (pthread_mutexattr_getrobust, int, (const pthread_mutexattr_t *restrict attr, int *restrict robustp), _GL_ARG_NONNULL ((1, 2))); @@ -950,7 +950,7 @@ _GL_CXXALIAS_RPL (pthread_mutexattr_getrobust, int, int *restrict robustp)); # else # if !@HAVE_PTHREAD_MUTEXATTR_GETROBUST@ -_GL_FUNCATTR_SYS (pthread_mutexattr_getrobust, int, +_GL_FUNCDECL_SYS (pthread_mutexattr_getrobust, int, (const pthread_mutexattr_t *restrict attr, int *restrict robustp), _GL_ARG_NONNULL ((1, 2))); @@ -978,14 +978,14 @@ _GL_WARN_ON_USE (pthread_mutexattr_getrobust, "pthread_mutexattr_getrobust is no # undef pthread_mutexattr_setrobust # define pthread_mutexattr_setrobust rpl_pthread_mutexattr_setrobust # endif -_GL_FUNCATTR_RPL (pthread_mutexattr_setrobust, int, +_GL_FUNCDECL_RPL (pthread_mutexattr_setrobust, int, (pthread_mutexattr_t *attr, int robust), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_setrobust, int, (pthread_mutexattr_t *attr, int robust)); # else # if !@HAVE_PTHREAD_MUTEXATTR_SETROBUST@ -_GL_FUNCATTR_SYS (pthread_mutexattr_setrobust, int, +_GL_FUNCDECL_SYS (pthread_mutexattr_setrobust, int, (pthread_mutexattr_t *attr, int robust), _GL_ARG_NONNULL ((1))); # endif @@ -1009,12 +1009,12 @@ _GL_WARN_ON_USE (pthread_mutexattr_setrobust, "pthread_mutexattr_setrobust is no # undef pthread_mutexattr_destroy # define pthread_mutexattr_destroy rpl_pthread_mutexattr_destroy # endif -_GL_FUNCATTR_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), +_GL_FUNCDECL_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr)); # else # if !@HAVE_PTHREAD_MUTEXATTR_DESTROY@ -_GL_FUNCATTR_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), +_GL_FUNCDECL_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr)); @@ -1036,12 +1036,12 @@ _GL_WARN_ON_USE (pthread_mutexattr_destroy, "pthread_mutexattr_destroy is not po # undef pthread_mutex_lock # define pthread_mutex_lock rpl_pthread_mutex_lock # endif -_GL_FUNCATTR_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_LOCK@ -_GL_FUNCATTR_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex)); @@ -1063,12 +1063,12 @@ _GL_WARN_ON_USE (pthread_mutex_lock, "pthread_mutex_lock is not portable - " # undef pthread_mutex_trylock # define pthread_mutex_trylock rpl_pthread_mutex_trylock # endif -_GL_FUNCATTR_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_TRYLOCK@ -_GL_FUNCATTR_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex)); @@ -1090,7 +1090,7 @@ _GL_WARN_ON_USE (pthread_mutex_trylock, "pthread_mutex_trylock is not portable - # undef pthread_mutex_timedlock # define pthread_mutex_timedlock rpl_pthread_mutex_timedlock # endif -_GL_FUNCATTR_RPL (pthread_mutex_timedlock, int, +_GL_FUNCDECL_RPL (pthread_mutex_timedlock, int, (pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1099,7 +1099,7 @@ _GL_CXXALIAS_RPL (pthread_mutex_timedlock, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_MUTEX_TIMEDLOCK@ -_GL_FUNCATTR_SYS (pthread_mutex_timedlock, int, +_GL_FUNCDECL_SYS (pthread_mutex_timedlock, int, (pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1125,12 +1125,12 @@ _GL_WARN_ON_USE (pthread_mutex_timedlock, "pthread_mutex_timedlock is not portab # undef pthread_mutex_unlock # define pthread_mutex_unlock rpl_pthread_mutex_unlock # endif -_GL_FUNCATTR_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_UNLOCK@ -_GL_FUNCATTR_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex)); @@ -1152,12 +1152,12 @@ _GL_WARN_ON_USE (pthread_mutex_unlock, "pthread_mutex_unlock is not portable - " # undef pthread_mutex_destroy # define pthread_mutex_destroy rpl_pthread_mutex_destroy # endif -_GL_FUNCATTR_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_DESTROY@ -_GL_FUNCATTR_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), +_GL_FUNCDECL_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex)); @@ -1181,7 +1181,7 @@ _GL_WARN_ON_USE (pthread_mutex_destroy, "pthread_mutex_destroy is not portable - # undef pthread_rwlock_init # define pthread_rwlock_init rpl_pthread_rwlock_init # endif -_GL_FUNCATTR_RPL (pthread_rwlock_init, int, +_GL_FUNCDECL_RPL (pthread_rwlock_init, int, (pthread_rwlock_t *restrict lock, const pthread_rwlockattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1190,7 +1190,7 @@ _GL_CXXALIAS_RPL (pthread_rwlock_init, int, const pthread_rwlockattr_t *restrict attr)); # else # if !@HAVE_PTHREAD_RWLOCK_INIT@ -_GL_FUNCATTR_SYS (pthread_rwlock_init, int, +_GL_FUNCDECL_SYS (pthread_rwlock_init, int, (pthread_rwlock_t *restrict lock, const pthread_rwlockattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1216,12 +1216,12 @@ _GL_WARN_ON_USE (pthread_rwlock_init, "pthread_rwlock_init is not portable - " # undef pthread_rwlockattr_init # define pthread_rwlockattr_init rpl_pthread_rwlockattr_init # endif -_GL_FUNCATTR_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), +_GL_FUNCDECL_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr)); # else # if !@HAVE_PTHREAD_RWLOCKATTR_INIT@ -_GL_FUNCATTR_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), +_GL_FUNCDECL_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr)); @@ -1243,13 +1243,13 @@ _GL_WARN_ON_USE (pthread_rwlockattr_init, "pthread_rwlockattr_init is not portab # undef pthread_rwlockattr_destroy # define pthread_rwlockattr_destroy rpl_pthread_rwlockattr_destroy # endif -_GL_FUNCATTR_RPL (pthread_rwlockattr_destroy, int, +_GL_FUNCDECL_RPL (pthread_rwlockattr_destroy, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlockattr_destroy, int, (pthread_rwlockattr_t *attr)); # else # if !@HAVE_PTHREAD_RWLOCKATTR_DESTROY@ -_GL_FUNCATTR_SYS (pthread_rwlockattr_destroy, int, +_GL_FUNCDECL_SYS (pthread_rwlockattr_destroy, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlockattr_destroy, int, @@ -1272,12 +1272,12 @@ _GL_WARN_ON_USE (pthread_rwlockattr_destroy, "pthread_rwlockattr_destroy is not # undef pthread_rwlock_rdlock # define pthread_rwlock_rdlock rpl_pthread_rwlock_rdlock # endif -_GL_FUNCATTR_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_RDLOCK@ -_GL_FUNCATTR_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock)); @@ -1299,12 +1299,12 @@ _GL_WARN_ON_USE (pthread_rwlock_rdlock, "pthread_rwlock_rdlock is not portable - # undef pthread_rwlock_wrlock # define pthread_rwlock_wrlock rpl_pthread_rwlock_wrlock # endif -_GL_FUNCATTR_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_WRLOCK@ -_GL_FUNCATTR_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock)); @@ -1326,12 +1326,12 @@ _GL_WARN_ON_USE (pthread_rwlock_wrlock, "pthread_rwlock_wrlock is not portable - # undef pthread_rwlock_tryrdlock # define pthread_rwlock_tryrdlock rpl_pthread_rwlock_tryrdlock # endif -_GL_FUNCATTR_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_TRYRDLOCK@ -_GL_FUNCATTR_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock)); @@ -1353,12 +1353,12 @@ _GL_WARN_ON_USE (pthread_rwlock_tryrdlock, "pthread_rwlock_tryrdlock is not port # undef pthread_rwlock_trywrlock # define pthread_rwlock_trywrlock rpl_pthread_rwlock_trywrlock # endif -_GL_FUNCATTR_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_TRYWRLOCK@ -_GL_FUNCATTR_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock)); @@ -1380,7 +1380,7 @@ _GL_WARN_ON_USE (pthread_rwlock_trywrlock, "pthread_rwlock_trywrlock is not port # undef pthread_rwlock_timedrdlock # define pthread_rwlock_timedrdlock rpl_pthread_rwlock_timedrdlock # endif -_GL_FUNCATTR_RPL (pthread_rwlock_timedrdlock, int, +_GL_FUNCDECL_RPL (pthread_rwlock_timedrdlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1389,7 +1389,7 @@ _GL_CXXALIAS_RPL (pthread_rwlock_timedrdlock, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK@ -_GL_FUNCATTR_SYS (pthread_rwlock_timedrdlock, int, +_GL_FUNCDECL_SYS (pthread_rwlock_timedrdlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1415,7 +1415,7 @@ _GL_WARN_ON_USE (pthread_rwlock_timedrdlock, "pthread_rwlock_timedrdlock is not # undef pthread_rwlock_timedwrlock # define pthread_rwlock_timedwrlock rpl_pthread_rwlock_timedwrlock # endif -_GL_FUNCATTR_RPL (pthread_rwlock_timedwrlock, int, +_GL_FUNCDECL_RPL (pthread_rwlock_timedwrlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1424,7 +1424,7 @@ _GL_CXXALIAS_RPL (pthread_rwlock_timedwrlock, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK@ -_GL_FUNCATTR_SYS (pthread_rwlock_timedwrlock, int, +_GL_FUNCDECL_SYS (pthread_rwlock_timedwrlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1450,12 +1450,12 @@ _GL_WARN_ON_USE (pthread_rwlock_timedwrlock, "pthread_rwlock_timedwrlock is not # undef pthread_rwlock_unlock # define pthread_rwlock_unlock rpl_pthread_rwlock_unlock # endif -_GL_FUNCATTR_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_UNLOCK@ -_GL_FUNCATTR_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock)); @@ -1477,12 +1477,12 @@ _GL_WARN_ON_USE (pthread_rwlock_unlock, "pthread_rwlock_unlock is not portable - # undef pthread_rwlock_destroy # define pthread_rwlock_destroy rpl_pthread_rwlock_destroy # endif -_GL_FUNCATTR_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_DESTROY@ -_GL_FUNCATTR_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), +_GL_FUNCDECL_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock)); @@ -1506,7 +1506,7 @@ _GL_WARN_ON_USE (pthread_rwlock_destroy, "pthread_rwlock_destroy is not portable # undef pthread_cond_init # define pthread_cond_init rpl_pthread_cond_init # endif -_GL_FUNCATTR_RPL (pthread_cond_init, int, +_GL_FUNCDECL_RPL (pthread_cond_init, int, (pthread_cond_t *restrict cond, const pthread_condattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1515,7 +1515,7 @@ _GL_CXXALIAS_RPL (pthread_cond_init, int, const pthread_condattr_t *restrict attr)); # else # if !@HAVE_PTHREAD_COND_INIT@ -_GL_FUNCATTR_SYS (pthread_cond_init, int, +_GL_FUNCDECL_SYS (pthread_cond_init, int, (pthread_cond_t *restrict cond, const pthread_condattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1541,12 +1541,12 @@ _GL_WARN_ON_USE (pthread_cond_init, "pthread_cond_init is not portable - " # undef pthread_condattr_init # define pthread_condattr_init rpl_pthread_condattr_init # endif -_GL_FUNCATTR_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr), +_GL_FUNCDECL_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr)); # else # if !@HAVE_PTHREAD_CONDATTR_INIT@ -_GL_FUNCATTR_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr), +_GL_FUNCDECL_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr)); @@ -1568,12 +1568,12 @@ _GL_WARN_ON_USE (pthread_condattr_init, "pthread_condattr_init is not portable - # undef pthread_condattr_destroy # define pthread_condattr_destroy rpl_pthread_condattr_destroy # endif -_GL_FUNCATTR_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr), +_GL_FUNCDECL_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr)); # else # if !@HAVE_PTHREAD_CONDATTR_DESTROY@ -_GL_FUNCATTR_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr), +_GL_FUNCDECL_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr)); @@ -1595,7 +1595,7 @@ _GL_WARN_ON_USE (pthread_condattr_destroy, "pthread_condattr_destroy is not port # undef pthread_cond_wait # define pthread_cond_wait rpl_pthread_cond_wait # endif -_GL_FUNCATTR_RPL (pthread_cond_wait, int, +_GL_FUNCDECL_RPL (pthread_cond_wait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex), _GL_ARG_NONNULL ((1, 2))); @@ -1604,7 +1604,7 @@ _GL_CXXALIAS_RPL (pthread_cond_wait, int, pthread_mutex_t *restrict mutex)); # else # if !@HAVE_PTHREAD_COND_WAIT@ -_GL_FUNCATTR_SYS (pthread_cond_wait, int, +_GL_FUNCDECL_SYS (pthread_cond_wait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex), _GL_ARG_NONNULL ((1, 2))); @@ -1630,7 +1630,7 @@ _GL_WARN_ON_USE (pthread_cond_wait, "pthread_cond_wait is not portable - " # undef pthread_cond_timedwait # define pthread_cond_timedwait rpl_pthread_cond_timedwait # endif -_GL_FUNCATTR_RPL (pthread_cond_timedwait, int, +_GL_FUNCDECL_RPL (pthread_cond_timedwait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), @@ -1641,7 +1641,7 @@ _GL_CXXALIAS_RPL (pthread_cond_timedwait, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_COND_TIMEDWAIT@ -_GL_FUNCATTR_SYS (pthread_cond_timedwait, int, +_GL_FUNCDECL_SYS (pthread_cond_timedwait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), @@ -1669,12 +1669,12 @@ _GL_WARN_ON_USE (pthread_cond_timedwait, "pthread_cond_timedwait is not portable # undef pthread_cond_signal # define pthread_cond_signal rpl_pthread_cond_signal # endif -_GL_FUNCATTR_RPL (pthread_cond_signal, int, (pthread_cond_t *cond), +_GL_FUNCDECL_RPL (pthread_cond_signal, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_cond_signal, int, (pthread_cond_t *cond)); # else # if !@HAVE_PTHREAD_COND_SIGNAL@ -_GL_FUNCATTR_SYS (pthread_cond_signal, int, (pthread_cond_t *cond), +_GL_FUNCDECL_SYS (pthread_cond_signal, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_cond_signal, int, (pthread_cond_t *cond)); @@ -1696,12 +1696,12 @@ _GL_WARN_ON_USE (pthread_cond_signal, "pthread_cond_signal is not portable - " # undef pthread_cond_broadcast # define pthread_cond_broadcast rpl_pthread_cond_broadcast # endif -_GL_FUNCATTR_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond), +_GL_FUNCDECL_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond)); # else # if !@HAVE_PTHREAD_COND_BROADCAST@ -_GL_FUNCATTR_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond), +_GL_FUNCDECL_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond)); @@ -1723,12 +1723,12 @@ _GL_WARN_ON_USE (pthread_cond_broadcast, "pthread_cond_broadcast is not portable # undef pthread_cond_destroy # define pthread_cond_destroy rpl_pthread_cond_destroy # endif -_GL_FUNCATTR_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond), +_GL_FUNCDECL_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond)); # else # if !@HAVE_PTHREAD_COND_DESTROY@ -_GL_FUNCATTR_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond), +_GL_FUNCDECL_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond)); @@ -1752,14 +1752,14 @@ _GL_WARN_ON_USE (pthread_cond_destroy, "pthread_cond_destroy is not portable - " # undef pthread_key_create # define pthread_key_create rpl_pthread_key_create # endif -_GL_FUNCATTR_RPL (pthread_key_create, int, +_GL_FUNCDECL_RPL (pthread_key_create, int, (pthread_key_t *keyp, void (*destructor) (void *)), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_key_create, int, (pthread_key_t *keyp, void (*destructor) (void *))); # else # if !@HAVE_PTHREAD_KEY_CREATE@ -_GL_FUNCATTR_SYS (pthread_key_create, int, +_GL_FUNCDECL_SYS (pthread_key_create, int, (pthread_key_t *keyp, void (*destructor) (void *)), _GL_ARG_NONNULL ((1))); # endif @@ -1784,13 +1784,13 @@ _GL_WARN_ON_USE (pthread_key_create, "pthread_key_create is not portable - " # define pthread_setspecific rpl_pthread_setspecific # endif _GL_FUNCDECL_RPL (pthread_setspecific, int, - (pthread_key_t key, const void *value)); + (pthread_key_t key, const void *value), ); _GL_CXXALIAS_RPL (pthread_setspecific, int, (pthread_key_t key, const void *value)); # else # if !@HAVE_PTHREAD_SETSPECIFIC@ _GL_FUNCDECL_SYS (pthread_setspecific, int, - (pthread_key_t key, const void *value)); + (pthread_key_t key, const void *value), ); # endif _GL_CXXALIAS_SYS (pthread_setspecific, int, (pthread_key_t key, const void *value)); @@ -1812,11 +1812,11 @@ _GL_WARN_ON_USE (pthread_setspecific, "pthread_setspecific is not portable - " # undef pthread_getspecific # define pthread_getspecific rpl_pthread_getspecific # endif -_GL_FUNCDECL_RPL (pthread_getspecific, void *, (pthread_key_t key)); +_GL_FUNCDECL_RPL (pthread_getspecific, void *, (pthread_key_t key), ); _GL_CXXALIAS_RPL (pthread_getspecific, void *, (pthread_key_t key)); # else # if !@HAVE_PTHREAD_GETSPECIFIC@ -_GL_FUNCDECL_SYS (pthread_getspecific, void *, (pthread_key_t key)); +_GL_FUNCDECL_SYS (pthread_getspecific, void *, (pthread_key_t key), ); # endif _GL_CXXALIAS_SYS (pthread_getspecific, void *, (pthread_key_t key)); # endif @@ -1837,11 +1837,11 @@ _GL_WARN_ON_USE (pthread_getspecific, "pthread_getspecific is not portable - " # undef pthread_key_delete # define pthread_key_delete rpl_pthread_key_delete # endif -_GL_FUNCDECL_RPL (pthread_key_delete, int, (pthread_key_t key)); +_GL_FUNCDECL_RPL (pthread_key_delete, int, (pthread_key_t key), ); _GL_CXXALIAS_RPL (pthread_key_delete, int, (pthread_key_t key)); # else # if !@HAVE_PTHREAD_KEY_DELETE@ -_GL_FUNCDECL_SYS (pthread_key_delete, int, (pthread_key_t key)); +_GL_FUNCDECL_SYS (pthread_key_delete, int, (pthread_key_t key), ); # endif _GL_CXXALIAS_SYS (pthread_key_delete, int, (pthread_key_t key)); # endif @@ -1864,14 +1864,14 @@ _GL_WARN_ON_USE (pthread_key_delete, "pthread_key_delete is not portable - " # undef pthread_spin_init # define pthread_spin_init rpl_pthread_spin_init # endif -_GL_FUNCATTR_RPL (pthread_spin_init, int, +_GL_FUNCDECL_RPL (pthread_spin_init, int, (pthread_spinlock_t *lock, int shared_across_processes), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_init, int, (pthread_spinlock_t *lock, int shared_across_processes)); # else # if !@HAVE_PTHREAD_SPIN_INIT@ -_GL_FUNCATTR_SYS (pthread_spin_init, int, +_GL_FUNCDECL_SYS (pthread_spin_init, int, (pthread_spinlock_t *lock, int shared_across_processes), _GL_ARG_NONNULL ((1))); # endif @@ -1895,12 +1895,12 @@ _GL_WARN_ON_USE (pthread_spin_init, "pthread_spin_init is not portable - " # undef pthread_spin_lock # define pthread_spin_lock rpl_pthread_spin_lock # endif -_GL_FUNCATTR_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_LOCK@ -_GL_FUNCATTR_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock)); @@ -1922,12 +1922,12 @@ _GL_WARN_ON_USE (pthread_spin_lock, "pthread_spin_lock is not portable - " # undef pthread_spin_trylock # define pthread_spin_trylock rpl_pthread_spin_trylock # endif -_GL_FUNCATTR_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_TRYLOCK@ -_GL_FUNCATTR_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock)); @@ -1949,12 +1949,12 @@ _GL_WARN_ON_USE (pthread_spin_trylock, "pthread_spin_trylock is not portable - " # undef pthread_spin_unlock # define pthread_spin_unlock rpl_pthread_spin_unlock # endif -_GL_FUNCATTR_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_UNLOCK@ -_GL_FUNCATTR_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock)); @@ -1976,12 +1976,12 @@ _GL_WARN_ON_USE (pthread_spin_unlock, "pthread_spin_unlock is not portable - " # undef pthread_spin_destroy # define pthread_spin_destroy rpl_pthread_spin_destroy # endif -_GL_FUNCATTR_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_DESTROY@ -_GL_FUNCATTR_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock), +_GL_FUNCDECL_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock)); diff --git a/lib/pty.in.h b/lib/pty.in.h index 9f597b2252..109dd6fdac 100644 --- a/lib/pty.in.h +++ b/lib/pty.in.h @@ -72,7 +72,7 @@ struct termios; # endif _GL_FUNCDECL_RPL (forkpty, int, (int *amaster, char *name, - struct termios const *termp, struct winsize const *winp)); + struct termios const *termp, struct winsize const *winp), ); _GL_CXXALIAS_RPL (forkpty, int, (int *amaster, char *name, struct termios const *termp, struct winsize const *winp)); @@ -80,7 +80,7 @@ _GL_CXXALIAS_RPL (forkpty, int, # if !@HAVE_FORKPTY@ _GL_FUNCDECL_SYS (forkpty, int, (int *amaster, char *name, - struct termios const *termp, struct winsize const *winp)); + struct termios const *termp, struct winsize const *winp), ); # endif _GL_CXXALIAS_SYS (forkpty, int, (int *amaster, char *name, @@ -106,7 +106,7 @@ _GL_WARN_ON_USE (forkpty, "forkpty is not declared consistently - " # endif _GL_FUNCDECL_RPL (openpty, int, (int *amaster, int *aslave, char *name, - struct termios const *termp, struct winsize const *winp)); + struct termios const *termp, struct winsize const *winp), ); _GL_CXXALIAS_RPL (openpty, int, (int *amaster, int *aslave, char *name, struct termios const *termp, struct winsize const *winp)); @@ -114,7 +114,7 @@ _GL_CXXALIAS_RPL (openpty, int, # if !@HAVE_OPENPTY@ _GL_FUNCDECL_SYS (openpty, int, (int *amaster, int *aslave, char *name, - struct termios const *termp, struct winsize const *winp)); + struct termios const *termp, struct winsize const *winp), ); # endif _GL_CXXALIAS_SYS (openpty, int, (int *amaster, int *aslave, char *name, diff --git a/lib/sched.in.h b/lib/sched.in.h index 838fb12bdc..57c6053242 100644 --- a/lib/sched.in.h +++ b/lib/sched.in.h @@ -88,11 +88,11 @@ struct sched_param # undef sched_yield # define sched_yield rpl_sched_yield # endif -_GL_FUNCDECL_RPL (sched_yield, int, (void)); +_GL_FUNCDECL_RPL (sched_yield, int, (void), ); _GL_CXXALIAS_RPL (sched_yield, int, (void)); # else # if !@HAVE_SCHED_YIELD@ -_GL_FUNCDECL_SYS (sched_yield, int, (void)); +_GL_FUNCDECL_SYS (sched_yield, int, (void), ); # endif _GL_CXXALIAS_SYS (sched_yield, int, (void)); # endif diff --git a/lib/search.in.h b/lib/search.in.h index 90854e724e..d9cde67062 100644 --- a/lib/search.in.h +++ b/lib/search.in.h @@ -147,7 +147,7 @@ typedef void (*_gl_search_action_fn) (const void *, VISIT, int); If one is found, it is returned. Otherwise, a new element equal to KEY is inserted in the tree and is returned. */ # if @REPLACE_TSEARCH@ -_GL_FUNCATTR_RPL (tsearch, void *, +_GL_FUNCDECL_RPL (tsearch, void *, (const void *key, void **vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -156,7 +156,7 @@ _GL_CXXALIAS_RPL (tsearch, void *, _gl_search_compar_fn compar)); # else # if !@HAVE_TSEARCH@ -_GL_FUNCATTR_SYS (tsearch, void *, +_GL_FUNCDECL_SYS (tsearch, void *, (const void *key, void **vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -172,7 +172,7 @@ _GL_CXXALIASWARN (tsearch); /* Searches an element in the tree *VROOTP that compares equal to KEY. If one is found, it is returned. Otherwise, NULL is returned. */ # if @REPLACE_TSEARCH@ -_GL_FUNCATTR_RPL (tfind, void *, +_GL_FUNCDECL_RPL (tfind, void *, (const void *key, void *const *vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -181,7 +181,7 @@ _GL_CXXALIAS_RPL (tfind, void *, _gl_search_compar_fn compar)); # else # if !@HAVE_TSEARCH@ -_GL_FUNCATTR_SYS (tfind, void *, +_GL_FUNCDECL_SYS (tfind, void *, (const void *key, void *const *vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -200,7 +200,7 @@ _GL_CXXALIASWARN (tfind); If one is found, it is removed from the tree, and its parent node is returned. Otherwise, NULL is returned. */ # if @REPLACE_TSEARCH@ -_GL_FUNCATTR_RPL (tdelete, void *, +_GL_FUNCDECL_RPL (tdelete, void *, (const void *restrict key, void **restrict vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -209,7 +209,7 @@ _GL_CXXALIAS_RPL (tdelete, void *, _gl_search_compar_fn compar)); # else # if !@HAVE_TSEARCH@ -_GL_FUNCATTR_SYS (tdelete, void *, +_GL_FUNCDECL_SYS (tdelete, void *, (const void *restrict key, void **restrict vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -234,14 +234,14 @@ _GL_CXXALIASWARN (tdelete); 2. an indicator which visit of the node this is, 3. the level of the node in the tree (0 for the root). */ # if @REPLACE_TWALK@ -_GL_FUNCATTR_RPL (twalk, void, +_GL_FUNCDECL_RPL (twalk, void, (const void *vroot, _gl_search_action_fn action), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (twalk, void, (const void *vroot, _gl_search_action_fn action)); # else # if !@HAVE_TWALK@ -_GL_FUNCATTR_SYS (twalk, void, +_GL_FUNCDECL_SYS (twalk, void, (const void *vroot, _gl_search_action_fn action), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/signal.in.h b/lib/signal.in.h index 1d198283c0..6239b90adf 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -149,7 +149,7 @@ typedef void (*sighandler_t) (int); #if @GNULIB_SIG2STR@ # if !@HAVE_SIG2STR@ -_GL_FUNCDECL_SYS (sig2str, int, (int signo, char *str)); +_GL_FUNCDECL_SYS (sig2str, int, (int signo, char *str), ); # endif _GL_CXXALIAS_SYS (sig2str, int, (int signo, char *str)); # if __GLIBC__ >= 2 @@ -165,7 +165,7 @@ _GL_WARN_ON_USE (sig2str, "sig2str is not portable - " #if @GNULIB_SIG2STR@ # if !@HAVE_STR2SIG@ -_GL_FUNCDECL_SYS (str2sig, int, (char const *str, int *signo_p)); +_GL_FUNCDECL_SYS (str2sig, int, (char const *str, int *signo_p), ); # endif _GL_CXXALIAS_SYS (str2sig, int, (char const *str, int *signo_p)); # if __GLIBC__ >= 2 @@ -189,7 +189,7 @@ _GL_WARN_ON_USE (str2sig, "str2sig is not portable - " _GL_FUNCDECL_RPL (pthread_sigmask, int, (int how, const sigset_t *restrict new_mask, - sigset_t *restrict old_mask)); + sigset_t *restrict old_mask), ); _GL_CXXALIAS_RPL (pthread_sigmask, int, (int how, const sigset_t *restrict new_mask, @@ -199,7 +199,7 @@ _GL_CXXALIAS_RPL (pthread_sigmask, int, _GL_FUNCDECL_SYS (pthread_sigmask, int, (int how, const sigset_t *restrict new_mask, - sigset_t *restrict old_mask)); + sigset_t *restrict old_mask), ); # endif _GL_CXXALIAS_SYS (pthread_sigmask, int, (int how, @@ -224,11 +224,11 @@ _GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - " # undef raise # define raise rpl_raise # endif -_GL_FUNCDECL_RPL (raise, int, (int sig)); +_GL_FUNCDECL_RPL (raise, int, (int sig), ); _GL_CXXALIAS_RPL (raise, int, (int sig)); # else # if !@HAVE_RAISE@ -_GL_FUNCDECL_SYS (raise, int, (int sig)); +_GL_FUNCDECL_SYS (raise, int, (int sig), ); # endif _GL_CXXALIAS_SYS (raise, int, (int sig)); # endif @@ -284,7 +284,7 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1]; # undef sigismember # endif # else -_GL_FUNCATTR_SYS (sigismember, int, (const sigset_t *set, int sig), +_GL_FUNCDECL_SYS (sigismember, int, (const sigset_t *set, int sig), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigismember, int, (const sigset_t *set, int sig)); @@ -297,7 +297,7 @@ _GL_CXXALIASWARN (sigismember); # undef sigemptyset # endif # else -_GL_FUNCATTR_SYS (sigemptyset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (sigemptyset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigemptyset, int, (sigset_t *set)); _GL_CXXALIASWARN (sigemptyset); @@ -309,7 +309,7 @@ _GL_CXXALIASWARN (sigemptyset); # undef sigaddset # endif # else -_GL_FUNCATTR_SYS (sigaddset, int, (sigset_t *set, int sig), +_GL_FUNCDECL_SYS (sigaddset, int, (sigset_t *set, int sig), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigaddset, int, (sigset_t *set, int sig)); @@ -322,7 +322,7 @@ _GL_CXXALIASWARN (sigaddset); # undef sigdelset # endif # else -_GL_FUNCATTR_SYS (sigdelset, int, (sigset_t *set, int sig), +_GL_FUNCDECL_SYS (sigdelset, int, (sigset_t *set, int sig), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigdelset, int, (sigset_t *set, int sig)); @@ -335,14 +335,14 @@ _GL_CXXALIASWARN (sigdelset); # undef sigfillset # endif # else -_GL_FUNCATTR_SYS (sigfillset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (sigfillset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigfillset, int, (sigset_t *set)); _GL_CXXALIASWARN (sigfillset); /* Return the set of those blocked signals that are pending. */ # if !@HAVE_POSIX_SIGNALBLOCKING@ -_GL_FUNCATTR_SYS (sigpending, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (sigpending, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigpending, int, (sigset_t *set)); _GL_CXXALIASWARN (sigpending); @@ -359,7 +359,7 @@ _GL_CXXALIASWARN (sigpending); _GL_FUNCDECL_SYS (sigprocmask, int, (int operation, const sigset_t *restrict set, - sigset_t *restrict old_set)); + sigset_t *restrict old_set), ); # endif _GL_CXXALIAS_SYS (sigprocmask, int, (int operation, @@ -384,7 +384,7 @@ typedef void (*_gl_function_taking_int_returning_void_t) (int); # define signal rpl_signal # endif _GL_FUNCDECL_RPL (signal, _gl_function_taking_int_returning_void_t, - (int sig, _gl_function_taking_int_returning_void_t func)); + (int sig, _gl_function_taking_int_returning_void_t func), ); _GL_CXXALIAS_RPL (signal, _gl_function_taking_int_returning_void_t, (int sig, _gl_function_taking_int_returning_void_t func)); # else @@ -392,7 +392,7 @@ _GL_CXXALIAS_RPL (signal, _gl_function_taking_int_returning_void_t, because it occurs in , not directly. */ # if defined __OpenBSD__ _GL_FUNCDECL_SYS (signal, _gl_function_taking_int_returning_void_t, - (int sig, _gl_function_taking_int_returning_void_t func)); + (int sig, _gl_function_taking_int_returning_void_t func), ); # endif _GL_CXXALIAS_SYS (signal, _gl_function_taking_int_returning_void_t, (int sig, _gl_function_taking_int_returning_void_t func)); @@ -510,7 +510,7 @@ struct sigaction # endif _GL_FUNCDECL_SYS (sigaction, int, (int, const struct sigaction *restrict, - struct sigaction *restrict)); + struct sigaction *restrict), ); # elif !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@ diff --git a/lib/spawn.in.h b/lib/spawn.in.h index b4923e1968..5f42407d87 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -204,7 +204,7 @@ typedef int verify_POSIX_SPAWN_USEVFORK_no_overlap # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn rpl_posix_spawn # endif -_GL_FUNCATTR_RPL (posix_spawn, int, +_GL_FUNCDECL_RPL (posix_spawn, int, (pid_t *_Restrict_ __pid, const char *_Restrict_ __path, const posix_spawn_file_actions_t *_Restrict_ __file_actions, @@ -221,7 +221,7 @@ _GL_CXXALIAS_RPL (posix_spawn, int, char *const envp[_Restrict_arr_])); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawn, int, +_GL_FUNCDECL_SYS (posix_spawn, int, (pid_t *_Restrict_ __pid, const char *_Restrict_ __path, const posix_spawn_file_actions_t *_Restrict_ __file_actions, @@ -258,7 +258,7 @@ _GL_WARN_ON_USE (posix_spawn, "posix_spawn is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnp rpl_posix_spawnp # endif -_GL_FUNCATTR_RPL (posix_spawnp, int, +_GL_FUNCDECL_RPL (posix_spawnp, int, (pid_t *__pid, const char *__file, const posix_spawn_file_actions_t *__file_actions, const posix_spawnattr_t *__attrp, @@ -271,7 +271,7 @@ _GL_CXXALIAS_RPL (posix_spawnp, int, char *const argv[], char *const envp[])); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnp, int, +_GL_FUNCDECL_SYS (posix_spawnp, int, (pid_t *__pid, const char *__file, const posix_spawn_file_actions_t *__file_actions, const posix_spawnattr_t *__attrp, @@ -302,12 +302,12 @@ _GL_WARN_ON_USE (posix_spawnp, "posix_spawnp is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_init rpl_posix_spawnattr_init # endif -_GL_FUNCATTR_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), +_GL_FUNCDECL_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), +_GL_FUNCDECL_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; # endif _GL_CXXALIAS_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr)); @@ -329,12 +329,12 @@ _GL_WARN_ON_USE (posix_spawnattr_init, "posix_spawnattr_init is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_destroy rpl_posix_spawnattr_destroy # endif -_GL_FUNCATTR_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), +_GL_FUNCDECL_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), +_GL_FUNCDECL_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; # endif _GL_CXXALIAS_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr)); @@ -358,7 +358,7 @@ _GL_WARN_ON_USE (posix_spawnattr_destroy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getsigdefault rpl_posix_spawnattr_getsigdefault # endif -_GL_FUNCATTR_RPL (posix_spawnattr_getsigdefault, int, +_GL_FUNCDECL_RPL (posix_spawnattr_getsigdefault, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -367,7 +367,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getsigdefault, int, sigset_t *_Restrict_ __sigdefault)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_getsigdefault, int, +_GL_FUNCDECL_SYS (posix_spawnattr_getsigdefault, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -394,7 +394,7 @@ _GL_WARN_ON_USE (posix_spawnattr_getsigdefault, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setsigdefault rpl_posix_spawnattr_setsigdefault # endif -_GL_FUNCATTR_RPL (posix_spawnattr_setsigdefault, int, +_GL_FUNCDECL_RPL (posix_spawnattr_setsigdefault, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -403,7 +403,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_setsigdefault, int, const sigset_t *_Restrict_ __sigdefault)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_setsigdefault, int, +_GL_FUNCDECL_SYS (posix_spawnattr_setsigdefault, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -430,7 +430,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setsigdefault, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getsigmask rpl_posix_spawnattr_getsigmask # endif -_GL_FUNCATTR_RPL (posix_spawnattr_getsigmask, int, +_GL_FUNCDECL_RPL (posix_spawnattr_getsigmask, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -439,7 +439,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getsigmask, int, sigset_t *_Restrict_ __sigmask)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_getsigmask, int, +_GL_FUNCDECL_SYS (posix_spawnattr_getsigmask, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -466,7 +466,7 @@ _GL_WARN_ON_USE (posix_spawnattr_getsigmask, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setsigmask rpl_posix_spawnattr_setsigmask # endif -_GL_FUNCATTR_RPL (posix_spawnattr_setsigmask, int, +_GL_FUNCDECL_RPL (posix_spawnattr_setsigmask, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -475,7 +475,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_setsigmask, int, const sigset_t *_Restrict_ __sigmask)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_setsigmask, int, +_GL_FUNCDECL_SYS (posix_spawnattr_setsigmask, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -502,7 +502,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setsigmask, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getflags rpl_posix_spawnattr_getflags # endif -_GL_FUNCATTR_RPL (posix_spawnattr_getflags, int, +_GL_FUNCDECL_RPL (posix_spawnattr_getflags, int, (const posix_spawnattr_t *_Restrict_ __attr, short int *_Restrict_ __flags), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -511,7 +511,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getflags, int, short int *_Restrict_ __flags)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_getflags, int, +_GL_FUNCDECL_SYS (posix_spawnattr_getflags, int, (const posix_spawnattr_t *_Restrict_ __attr, short int *_Restrict_ __flags), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -538,14 +538,14 @@ _GL_WARN_ON_USE (posix_spawnattr_getflags, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setflags rpl_posix_spawnattr_setflags # endif -_GL_FUNCATTR_RPL (posix_spawnattr_setflags, int, +_GL_FUNCDECL_RPL (posix_spawnattr_setflags, int, (posix_spawnattr_t *__attr, short int __flags), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_setflags, int, (posix_spawnattr_t *__attr, short int __flags)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_setflags, int, +_GL_FUNCDECL_SYS (posix_spawnattr_setflags, int, (posix_spawnattr_t *__attr, short int __flags), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -570,7 +570,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setflags, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getpgroup rpl_posix_spawnattr_getpgroup # endif -_GL_FUNCATTR_RPL (posix_spawnattr_getpgroup, int, +_GL_FUNCDECL_RPL (posix_spawnattr_getpgroup, int, (const posix_spawnattr_t *_Restrict_ __attr, pid_t *_Restrict_ __pgroup), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -579,7 +579,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getpgroup, int, pid_t *_Restrict_ __pgroup)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_getpgroup, int, +_GL_FUNCDECL_SYS (posix_spawnattr_getpgroup, int, (const posix_spawnattr_t *_Restrict_ __attr, pid_t *_Restrict_ __pgroup), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -606,14 +606,14 @@ _GL_WARN_ON_USE (posix_spawnattr_getpgroup, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setpgroup rpl_posix_spawnattr_setpgroup # endif -_GL_FUNCATTR_RPL (posix_spawnattr_setpgroup, int, +_GL_FUNCDECL_RPL (posix_spawnattr_setpgroup, int, (posix_spawnattr_t *__attr, pid_t __pgroup), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_setpgroup, int, (posix_spawnattr_t *__attr, pid_t __pgroup)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawnattr_setpgroup, int, +_GL_FUNCDECL_SYS (posix_spawnattr_setpgroup, int, (posix_spawnattr_t *__attr, pid_t __pgroup), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -638,7 +638,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setpgroup, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getschedpolicy rpl_posix_spawnattr_getschedpolicy # endif -_GL_FUNCATTR_RPL (posix_spawnattr_getschedpolicy, int, +_GL_FUNCDECL_RPL (posix_spawnattr_getschedpolicy, int, (const posix_spawnattr_t *_Restrict_ __attr, int *_Restrict_ __schedpolicy), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -647,7 +647,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getschedpolicy, int, int *_Restrict_ __schedpolicy)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDULER == 0 -_GL_FUNCATTR_SYS (posix_spawnattr_getschedpolicy, int, +_GL_FUNCDECL_SYS (posix_spawnattr_getschedpolicy, int, (const posix_spawnattr_t *_Restrict_ __attr, int *_Restrict_ __schedpolicy), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -674,14 +674,14 @@ _GL_WARN_ON_USE (posix_spawnattr_getschedpolicy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setschedpolicy rpl_posix_spawnattr_setschedpolicy # endif -_GL_FUNCATTR_RPL (posix_spawnattr_setschedpolicy, int, +_GL_FUNCDECL_RPL (posix_spawnattr_setschedpolicy, int, (posix_spawnattr_t *__attr, int __schedpolicy), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_setschedpolicy, int, (posix_spawnattr_t *__attr, int __schedpolicy)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDULER == 0 -_GL_FUNCATTR_SYS (posix_spawnattr_setschedpolicy, int, +_GL_FUNCDECL_SYS (posix_spawnattr_setschedpolicy, int, (posix_spawnattr_t *__attr, int __schedpolicy), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -706,7 +706,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setschedpolicy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getschedparam rpl_posix_spawnattr_getschedparam # endif -_GL_FUNCATTR_RPL (posix_spawnattr_getschedparam, int, +_GL_FUNCDECL_RPL (posix_spawnattr_getschedparam, int, (const posix_spawnattr_t *_Restrict_ __attr, struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -715,7 +715,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getschedparam, int, struct sched_param *_Restrict_ __schedparam)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDPARAM == 0 -_GL_FUNCATTR_SYS (posix_spawnattr_getschedparam, int, +_GL_FUNCDECL_SYS (posix_spawnattr_getschedparam, int, (const posix_spawnattr_t *_Restrict_ __attr, struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -742,7 +742,7 @@ _GL_WARN_ON_USE (posix_spawnattr_getschedparam, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setschedparam rpl_posix_spawnattr_setschedparam # endif -_GL_FUNCATTR_RPL (posix_spawnattr_setschedparam, int, +_GL_FUNCDECL_RPL (posix_spawnattr_setschedparam, int, (posix_spawnattr_t *_Restrict_ __attr, const struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -751,7 +751,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_setschedparam, int, const struct sched_param *_Restrict_ __schedparam)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDPARAM == 0 -_GL_FUNCATTR_SYS (posix_spawnattr_setschedparam, int, +_GL_FUNCDECL_SYS (posix_spawnattr_setschedparam, int, (posix_spawnattr_t *_Restrict_ __attr, const struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -779,14 +779,14 @@ _GL_WARN_ON_USE (posix_spawnattr_setschedparam, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_init rpl_posix_spawn_file_actions_init # endif -_GL_FUNCATTR_RPL (posix_spawn_file_actions_init, int, +_GL_FUNCDECL_RPL (posix_spawn_file_actions_init, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawn_file_actions_init, int, (posix_spawn_file_actions_t *__file_actions)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawn_file_actions_init, int, +_GL_FUNCDECL_SYS (posix_spawn_file_actions_init, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -811,14 +811,14 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_init, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_destroy rpl_posix_spawn_file_actions_destroy # endif -_GL_FUNCATTR_RPL (posix_spawn_file_actions_destroy, int, +_GL_FUNCDECL_RPL (posix_spawn_file_actions_destroy, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawn_file_actions_destroy, int, (posix_spawn_file_actions_t *__file_actions)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawn_file_actions_destroy, int, +_GL_FUNCDECL_SYS (posix_spawn_file_actions_destroy, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -844,7 +844,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_destroy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addopen rpl_posix_spawn_file_actions_addopen # endif -_GL_FUNCATTR_RPL (posix_spawn_file_actions_addopen, int, +_GL_FUNCDECL_RPL (posix_spawn_file_actions_addopen, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd, const char *_Restrict_ __path, int __oflag, mode_t __mode), @@ -855,7 +855,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_addopen, int, const char *_Restrict_ __path, int __oflag, mode_t __mode)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawn_file_actions_addopen, int, +_GL_FUNCDECL_SYS (posix_spawn_file_actions_addopen, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd, const char *_Restrict_ __path, int __oflag, mode_t __mode), @@ -885,14 +885,14 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_addopen, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addclose rpl_posix_spawn_file_actions_addclose # endif -_GL_FUNCATTR_RPL (posix_spawn_file_actions_addclose, int, +_GL_FUNCDECL_RPL (posix_spawn_file_actions_addclose, int, (posix_spawn_file_actions_t *__file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawn_file_actions_addclose, int, (posix_spawn_file_actions_t *__file_actions, int __fd)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawn_file_actions_addclose, int, +_GL_FUNCDECL_SYS (posix_spawn_file_actions_addclose, int, (posix_spawn_file_actions_t *__file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -918,7 +918,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_addclose, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_adddup2 rpl_posix_spawn_file_actions_adddup2 # endif -_GL_FUNCATTR_RPL (posix_spawn_file_actions_adddup2, int, +_GL_FUNCDECL_RPL (posix_spawn_file_actions_adddup2, int, (posix_spawn_file_actions_t *__file_actions, int __fd, int __newfd), _GL_ARG_NONNULL ((1))) __THROW; @@ -927,7 +927,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_adddup2, int, int __fd, int __newfd)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCATTR_SYS (posix_spawn_file_actions_adddup2, int, +_GL_FUNCDECL_SYS (posix_spawn_file_actions_adddup2, int, (posix_spawn_file_actions_t *__file_actions, int __fd, int __newfd), _GL_ARG_NONNULL ((1))) __THROW; @@ -955,7 +955,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_adddup2, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addchdir rpl_posix_spawn_file_actions_addchdir # endif -_GL_FUNCATTR_RPL (posix_spawn_file_actions_addchdir, int, +_GL_FUNCDECL_RPL (posix_spawn_file_actions_addchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, const char *_Restrict_ __path), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -964,7 +964,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_addchdir, int, const char *_Restrict_ __path)); # else # if !@HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ -_GL_FUNCATTR_SYS (posix_spawn_file_actions_addchdir, int, +_GL_FUNCDECL_SYS (posix_spawn_file_actions_addchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, const char *_Restrict_ __path), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -992,7 +992,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_addchdir, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addfchdir rpl_posix_spawn_file_actions_addfchdir # endif -_GL_FUNCATTR_RPL (posix_spawn_file_actions_addfchdir, int, +_GL_FUNCDECL_RPL (posix_spawn_file_actions_addfchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; @@ -1001,7 +1001,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_addfchdir, int, int __fd)); # else # if !@HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR@ -_GL_FUNCATTR_SYS (posix_spawn_file_actions_addfchdir, int, +_GL_FUNCDECL_SYS (posix_spawn_file_actions_addfchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 5e967f6a35..e77798d9b2 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -288,7 +288,7 @@ Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure codes are ENOMEM and the possible failure codes from write(), excluding EINTR. */ -_GL_FUNCATTR_SYS (dzprintf, off64_t, +_GL_FUNCDECL_SYS (dzprintf, off64_t, (int fd, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); @@ -304,13 +304,13 @@ _GL_CXXALIAS_SYS (dzprintf, off64_t, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dprintf rpl_dprintf # endif -_GL_FUNCATTR_RPL (dprintf, int, (int fd, const char *restrict format, ...), +_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *restrict format, ...)); # else # if !@HAVE_DPRINTF@ -_GL_FUNCATTR_SYS (dprintf, int, (int fd, const char *restrict format, ...), +_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); # endif @@ -333,7 +333,7 @@ _GL_WARN_ON_USE (dprintf, "dprintf is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define fclose rpl_fclose # endif -_GL_FUNCATTR_RPL (fclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (fclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fclose, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (fclose, int, (FILE *stream)); @@ -379,7 +379,7 @@ _GL_CXXALIASWARN (fcloseall); # undef fdopen # define fdopen rpl_fdopen # endif -_GL_FUNCATTR_RPL (fdopen, FILE *, +_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC @@ -395,14 +395,14 @@ _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (fdopen, FILE *, +_GL_FUNCDECL_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (fdopen, FILE *, +_GL_FUNCDECL_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC @@ -416,13 +416,13 @@ _GL_CXXALIASWARN (fdopen); # if @GNULIB_FCLOSE@ && (__GNUC__ >= 11 && !defined __clang__) && !defined fdopen /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (fdopen, FILE *, +_GL_FUNCDECL_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (fdopen, FILE *, +_GL_FUNCDECL_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC); @@ -461,7 +461,7 @@ _GL_CXXALIASWARN (fdopen); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define fflush rpl_fflush # endif -_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream)); +_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream), ); _GL_CXXALIAS_RPL (fflush, int, (FILE *gl_stream)); # else _GL_CXXALIAS_SYS (fflush, int, (FILE *gl_stream)); @@ -482,7 +482,7 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " # undef fgetc # define fgetc rpl_fgetc # endif -_GL_FUNCATTR_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fgetc, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (fgetc, int, (FILE *stream)); @@ -498,7 +498,7 @@ _GL_CXXALIASWARN (fgetc); # undef fgets # define fgets rpl_fgets # endif -_GL_FUNCATTR_RPL (fgets, char *, +_GL_FUNCDECL_RPL (fgets, char *, (char *restrict s, int n, FILE *restrict stream), _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fgets, char *, @@ -535,7 +535,7 @@ _GL_CXXALIASWARN (fileno); # undef fopen # define fopen rpl_fopen # endif -_GL_FUNCATTR_RPL (fopen, FILE *, +_GL_FUNCDECL_RPL (fopen, FILE *, (const char *restrict filename, const char *restrict mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -544,7 +544,7 @@ _GL_CXXALIAS_RPL (fopen, FILE *, # else # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -_GL_FUNCATTR_SYS (fopen, FILE *, +_GL_FUNCDECL_SYS (fopen, FILE *, (const char *restrict filename, const char *restrict mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_NODISCARD); @@ -558,7 +558,7 @@ _GL_CXXALIASWARN (fopen); #else # if @GNULIB_FCLOSE@ && (__GNUC__ >= 11 && !defined __clang__) && !defined fopen /* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -_GL_FUNCATTR_SYS (fopen, FILE *, +_GL_FUNCDECL_SYS (fopen, FILE *, (const char *restrict filename, const char *restrict mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); # endif @@ -578,7 +578,7 @@ _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX complian Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCATTR_SYS (fzprintf, off64_t, +_GL_FUNCDECL_SYS (fzprintf, off64_t, (FILE *restrict fp, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -597,12 +597,12 @@ _GL_CXXALIAS_SYS (fzprintf, off64_t, # endif # define GNULIB_overrides_fprintf 1 # if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCATTR_RPL (fprintf, int, +_GL_FUNCDECL_RPL (fprintf, int, (FILE *restrict fp, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); # else -_GL_FUNCATTR_RPL (fprintf, int, +_GL_FUNCDECL_RPL (fprintf, int, (FILE *restrict fp, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -638,11 +638,11 @@ _GL_WARN_ON_USE (fprintf, "fprintf is not always POSIX compliant - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define fpurge rpl_fpurge # endif -_GL_FUNCATTR_RPL (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fpurge, int, (FILE *gl_stream)); # else # if !@HAVE_DECL_FPURGE@ -_GL_FUNCATTR_SYS (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (fpurge, int, (FILE *gl_stream)); # endif @@ -663,7 +663,7 @@ _GL_WARN_ON_USE (fpurge, "fpurge is not always present - " # undef fputc # define fputc rpl_fputc # endif -_GL_FUNCATTR_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); +_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (fputc, int, (int c, FILE *stream)); # else _GL_CXXALIAS_SYS (fputc, int, (int c, FILE *stream)); @@ -679,7 +679,7 @@ _GL_CXXALIASWARN (fputc); # undef fputs # define fputs rpl_fputs # endif -_GL_FUNCATTR_RPL (fputs, int, +_GL_FUNCDECL_RPL (fputs, int, (const char *restrict string, FILE *restrict stream), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (fputs, int, @@ -699,7 +699,7 @@ _GL_CXXALIASWARN (fputs); # undef fread # define fread rpl_fread # endif -_GL_FUNCATTR_RPL (fread, size_t, +_GL_FUNCDECL_RPL (fread, size_t, (void *restrict ptr, size_t s, size_t n, FILE *restrict stream), _GL_ARG_NONNULL ((4)) _GL_ATTRIBUTE_NODISCARD); @@ -722,7 +722,7 @@ _GL_CXXALIASWARN (fread); # undef freopen # define freopen rpl_freopen # endif -_GL_FUNCATTR_RPL (freopen, FILE *, +_GL_FUNCDECL_RPL (freopen, FILE *, (const char *restrict filename, const char *restrict mode, FILE *restrict stream), _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -751,7 +751,7 @@ _GL_WARN_ON_USE (freopen, # undef fscanf # define fscanf rpl_fscanf # endif -_GL_FUNCATTR_RPL (fscanf, int, +_GL_FUNCDECL_RPL (fscanf, int, (FILE *restrict stream, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3) _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); @@ -808,7 +808,7 @@ _GL_CXXALIASWARN (fscanf); # undef fseek # define fseek rpl_fseek # endif -_GL_FUNCATTR_RPL (fseek, int, (FILE *fp, long offset, int whence), +_GL_FUNCDECL_RPL (fseek, int, (FILE *fp, long offset, int whence), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fseek, int, (FILE *fp, long offset, int whence)); # else @@ -831,12 +831,12 @@ _GL_CXXALIASWARN (fseek); # undef fseeko # define fseeko rpl_fseeko # endif -_GL_FUNCATTR_RPL (fseeko, int, (FILE *fp, off_t offset, int whence), +_GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence)); # else # if ! @HAVE_DECL_FSEEKO@ -_GL_FUNCATTR_SYS (fseeko, int, (FILE *fp, off_t offset, int whence), +_GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)); @@ -874,7 +874,7 @@ _GL_WARN_ON_USE (fseek, "fseek cannot handle files larger than 4 GB " # undef ftell # define ftell rpl_ftell # endif -_GL_FUNCATTR_RPL (ftell, long, (FILE *fp), +_GL_FUNCDECL_RPL (ftell, long, (FILE *fp), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ftell, long, (FILE *fp)); # else @@ -895,12 +895,12 @@ _GL_CXXALIASWARN (ftell); # undef ftello # define ftello rpl_ftello # endif -_GL_FUNCATTR_RPL (ftello, off_t, (FILE *fp), +_GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp)); # else # if ! @HAVE_DECL_FTELLO@ -_GL_FUNCATTR_SYS (ftello, off_t, (FILE *fp), +_GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp)); @@ -932,7 +932,7 @@ _GL_WARN_ON_USE (ftell, "ftell cannot handle files larger than 4 GB " # undef fwrite # define fwrite rpl_fwrite # endif -_GL_FUNCATTR_RPL (fwrite, size_t, +_GL_FUNCDECL_RPL (fwrite, size_t, (const void *restrict ptr, size_t s, size_t n, FILE *restrict stream), _GL_ARG_NONNULL ((1, 4))); @@ -978,7 +978,7 @@ _GL_CXXALIASWARN (fwrite); # undef getc # define getc rpl_fgetc # endif -_GL_FUNCATTR_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (getc, int, (FILE *stream)); @@ -994,7 +994,7 @@ _GL_CXXALIASWARN (getc); # undef getchar # define getchar rpl_getchar # endif -_GL_FUNCDECL_RPL (getchar, int, (void)); +_GL_FUNCDECL_RPL (getchar, int, (void), ); _GL_CXXALIAS_RPL (getchar, int, (void)); # else _GL_CXXALIAS_SYS (getchar, int, (void)); @@ -1016,7 +1016,7 @@ _GL_CXXALIASWARN (getchar); # undef getdelim # define getdelim rpl_getdelim # endif -_GL_FUNCATTR_RPL (getdelim, ssize_t, +_GL_FUNCDECL_RPL (getdelim, ssize_t, (char **restrict lineptr, size_t *restrict linesize, int delimiter, FILE *restrict stream), @@ -1027,7 +1027,7 @@ _GL_CXXALIAS_RPL (getdelim, ssize_t, FILE *restrict stream)); # else # if !@HAVE_DECL_GETDELIM@ -_GL_FUNCATTR_SYS (getdelim, ssize_t, +_GL_FUNCDECL_SYS (getdelim, ssize_t, (char **restrict lineptr, size_t *restrict linesize, int delimiter, FILE *restrict stream), @@ -1061,7 +1061,7 @@ _GL_WARN_ON_USE (getdelim, "getdelim is unportable - " # undef getline # define getline rpl_getline # endif -_GL_FUNCATTR_RPL (getline, ssize_t, +_GL_FUNCDECL_RPL (getline, ssize_t, (char **restrict lineptr, size_t *restrict linesize, FILE *restrict stream), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -1070,7 +1070,7 @@ _GL_CXXALIAS_RPL (getline, ssize_t, FILE *restrict stream)); # else # if !@HAVE_DECL_GETLINE@ -_GL_FUNCATTR_SYS (getline, ssize_t, +_GL_FUNCDECL_SYS (getline, ssize_t, (char **restrict lineptr, size_t *restrict linesize, FILE *restrict stream), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -1112,7 +1112,7 @@ _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream)); # if @HAVE_DECL_GETW@ # if defined __APPLE__ && defined __MACH__ /* The presence of the declaration depends on _POSIX_C_SOURCE. */ -_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream)); +_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream), ); # endif _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream)); # endif @@ -1134,13 +1134,13 @@ struct obstack; Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is through obstack_alloc_failed_handler. */ -_GL_FUNCATTR_SYS (obstack_zprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (obstack_zprintf, ptrdiff_t, (struct obstack *obs, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_SYS (obstack_zprintf, ptrdiff_t, (struct obstack *obs, const char *format, ...)); -_GL_FUNCATTR_SYS (obstack_vzprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (obstack_vzprintf, ptrdiff_t, (struct obstack *obs, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); @@ -1159,7 +1159,7 @@ struct obstack; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define obstack_printf rpl_obstack_printf # endif -_GL_FUNCATTR_RPL (obstack_printf, int, +_GL_FUNCDECL_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -1167,7 +1167,7 @@ _GL_CXXALIAS_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...)); # else # if !@HAVE_DECL_OBSTACK_PRINTF@ -_GL_FUNCATTR_SYS (obstack_printf, int, +_GL_FUNCDECL_SYS (obstack_printf, int, (struct obstack *obs, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -1180,7 +1180,7 @@ _GL_CXXALIASWARN (obstack_printf); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define obstack_vprintf rpl_obstack_vprintf # endif -_GL_FUNCATTR_RPL (obstack_vprintf, int, +_GL_FUNCDECL_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); @@ -1188,7 +1188,7 @@ _GL_CXXALIAS_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args)); # else # if !@HAVE_DECL_OBSTACK_PRINTF@ -_GL_FUNCATTR_SYS (obstack_vprintf, int, +_GL_FUNCDECL_SYS (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); @@ -1201,7 +1201,7 @@ _GL_CXXALIASWARN (obstack_vprintf); #if @GNULIB_PCLOSE@ # if !@HAVE_PCLOSE@ -_GL_FUNCATTR_SYS (pclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (pclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pclose, int, (FILE *stream)); _GL_CXXALIASWARN (pclose); @@ -1221,7 +1221,7 @@ _GL_WARN_ON_USE (pclose, "pclose is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define perror rpl_perror # endif -_GL_FUNCDECL_RPL (perror, void, (const char *string)); +_GL_FUNCDECL_RPL (perror, void, (const char *string), ); _GL_CXXALIAS_RPL (perror, void, (const char *string)); # else _GL_CXXALIAS_SYS (perror, void, (const char *string)); @@ -1242,14 +1242,14 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " # undef popen # define popen rpl_popen # endif -_GL_FUNCATTR_RPL (popen, FILE *, +_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); # else # if !@HAVE_POPEN@ || (__GNUC__ >= 11 && !defined __clang__) -_GL_FUNCATTR_SYS (popen, FILE *, +_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -1261,7 +1261,7 @@ _GL_CXXALIASWARN (popen); # if @GNULIB_PCLOSE@ \ && (__GNUC__ >= 11 && !defined __clang__) && !defined popen /* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ -_GL_FUNCATTR_SYS (popen, FILE *, +_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) _GL_ATTRIBUTE_MALLOC); @@ -1283,7 +1283,7 @@ _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCATTR_SYS (zprintf, off64_t, (const char *restrict format, ...), +_GL_FUNCDECL_SYS (zprintf, off64_t, (const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (zprintf, off64_t, (const char *restrict format, ...)); @@ -1301,14 +1301,14 @@ _GL_CXXALIAS_SYS (zprintf, off64_t, (const char *restrict format, ...)); # define printf __printf__ # endif # if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCATTR_RPL_1 (__printf__, int, +_GL_FUNCDECL_RPL_1 (__printf__, int, (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); # else -_GL_FUNCATTR_RPL_1 (__printf__, int, +_GL_FUNCDECL_RPL_1 (__printf__, int, (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)), @@ -1320,7 +1320,7 @@ _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...)); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define printf rpl_printf # endif -_GL_FUNCATTR_RPL (printf, int, +_GL_FUNCDECL_RPL (printf, int, (const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); @@ -1350,7 +1350,7 @@ _GL_WARN_ON_USE (printf, "printf is not always POSIX compliant - " # undef putc # define putc rpl_fputc # endif -_GL_FUNCATTR_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); +_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL_1 (putc, rpl_fputc, int, (int c, FILE *stream)); # else _GL_CXXALIAS_SYS (putc, int, (int c, FILE *stream)); @@ -1366,7 +1366,7 @@ _GL_CXXALIASWARN (putc); # undef putchar # define putchar rpl_putchar # endif -_GL_FUNCDECL_RPL (putchar, int, (int c)); +_GL_FUNCDECL_RPL (putchar, int, (int c), ); _GL_CXXALIAS_RPL (putchar, int, (int c)); # else _GL_CXXALIAS_SYS (putchar, int, (int c)); @@ -1382,7 +1382,7 @@ _GL_CXXALIASWARN (putchar); # undef puts # define puts rpl_puts # endif -_GL_FUNCATTR_RPL (puts, int, (const char *string), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (puts, int, (const char *string), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (puts, int, (const char *string)); # else _GL_CXXALIAS_SYS (puts, int, (const char *string)); @@ -1406,7 +1406,7 @@ _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream)); # if @HAVE_DECL_PUTW@ # if defined __APPLE__ && defined __MACH__ /* The presence of the declaration depends on _POSIX_C_SOURCE. */ -_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream)); +_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream), ); # endif _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream)); # endif @@ -1422,7 +1422,7 @@ _GL_CXXALIASWARN (putw); # undef remove # define remove rpl_remove # endif -_GL_FUNCATTR_RPL (remove, int, (const char *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (remove, int, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (remove, int, (const char *name)); # else _GL_CXXALIAS_SYS (remove, int, (const char *name)); @@ -1443,7 +1443,7 @@ _GL_WARN_ON_USE (remove, "remove cannot handle directories on some platforms - " # undef rename # define rename rpl_rename # endif -_GL_FUNCATTR_RPL (rename, int, +_GL_FUNCDECL_RPL (rename, int, (const char *old_filename, const char *new_filename), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (rename, int, @@ -1468,14 +1468,14 @@ _GL_WARN_ON_USE (rename, "rename is buggy on some platforms - " # undef renameat # define renameat rpl_renameat # endif -_GL_FUNCATTR_RPL (renameat, int, +_GL_FUNCDECL_RPL (renameat, int, (int fd1, char const *file1, int fd2, char const *file2), _GL_ARG_NONNULL ((2, 4))); _GL_CXXALIAS_RPL (renameat, int, (int fd1, char const *file1, int fd2, char const *file2)); # else # if !@HAVE_RENAMEAT@ -_GL_FUNCATTR_SYS (renameat, int, +_GL_FUNCDECL_SYS (renameat, int, (int fd1, char const *file1, int fd2, char const *file2), _GL_ARG_NONNULL ((2, 4))); # endif @@ -1499,7 +1499,7 @@ _GL_WARN_ON_USE (renameat, "renameat is not portable - " /* Don't break __attribute__((format(scanf,M,N))). */ # define scanf __scanf__ # endif -_GL_FUNCATTR_RPL_1 (__scanf__, int, +_GL_FUNCDECL_RPL_1 (__scanf__, int, (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf)), @@ -1511,7 +1511,7 @@ _GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *restrict format, ...)); # undef scanf # define scanf rpl_scanf # endif -_GL_FUNCATTR_RPL (scanf, int, (const char *restrict format, ...), +_GL_FUNCDECL_RPL (scanf, int, (const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (scanf, int, (const char *restrict format, ...)); @@ -1533,7 +1533,7 @@ _GL_CXXALIASWARN (scanf); Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCATTR_SYS (snzprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (snzprintf, ptrdiff_t, (char *restrict str, size_t size, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) @@ -1554,7 +1554,7 @@ _GL_CXXALIAS_SYS (snzprintf, ptrdiff_t, # define snprintf rpl_snprintf # endif # define GNULIB_overrides_snprintf 1 -_GL_FUNCATTR_RPL (snprintf, int, +_GL_FUNCDECL_RPL (snprintf, int, (char *restrict str, size_t size, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) @@ -1564,7 +1564,7 @@ _GL_CXXALIAS_RPL (snprintf, int, const char *restrict format, ...)); # else # if !@HAVE_DECL_SNPRINTF@ -_GL_FUNCATTR_SYS (snprintf, int, +_GL_FUNCDECL_SYS (snprintf, int, (char *restrict str, size_t size, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) @@ -1592,7 +1592,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCATTR_SYS (szprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (szprintf, ptrdiff_t, (char *restrict str, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) @@ -1620,7 +1620,7 @@ _GL_CXXALIAS_SYS (szprintf, ptrdiff_t, # define sprintf rpl_sprintf # endif # define GNULIB_overrides_sprintf 1 -_GL_FUNCATTR_RPL (sprintf, int, +_GL_FUNCDECL_RPL (sprintf, int, (char *restrict str, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -1662,7 +1662,7 @@ _GL_CXXALIASWARN (tempnam); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tmpfile rpl_tmpfile # endif -_GL_FUNCATTR_RPL (tmpfile, FILE *, (void), +_GL_FUNCDECL_RPL (tmpfile, FILE *, (void), _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -1670,7 +1670,7 @@ _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); # else # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -_GL_FUNCATTR_SYS (tmpfile, FILE *, (void), +_GL_FUNCDECL_SYS (tmpfile, FILE *, (void), _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -1684,7 +1684,7 @@ _GL_CXXALIASWARN (tmpfile); # if @GNULIB_FCLOSE@ \ && (__GNUC__ >= 11 && !defined __clang__) && !defined tmpfile /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -_GL_FUNCATTR_SYS (tmpfile, FILE *, (void), +_GL_FUNCDECL_SYS (tmpfile, FILE *, (void), _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC); # endif @@ -1706,14 +1706,14 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCATTR_SYS (aszprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (aszprintf, ptrdiff_t, (char **result, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_SYS (aszprintf, ptrdiff_t, (char **result, const char *format, ...)); -_GL_FUNCATTR_SYS (vaszprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (vaszprintf, ptrdiff_t, (char **result, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2)) @@ -1732,7 +1732,7 @@ _GL_CXXALIAS_SYS (vaszprintf, ptrdiff_t, # define asprintf rpl_asprintf # endif # define GNULIB_overrides_asprintf -_GL_FUNCATTR_RPL (asprintf, int, +_GL_FUNCDECL_RPL (asprintf, int, (char **result, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2)) @@ -1741,7 +1741,7 @@ _GL_CXXALIAS_RPL (asprintf, int, (char **result, const char *format, ...)); # else # if !@HAVE_VASPRINTF@ -_GL_FUNCATTR_SYS (asprintf, int, +_GL_FUNCDECL_SYS (asprintf, int, (char **result, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2)) @@ -1756,7 +1756,7 @@ _GL_CXXALIASWARN (asprintf); # define vasprintf rpl_vasprintf # endif # define GNULIB_overrides_vasprintf 1 -_GL_FUNCATTR_RPL (vasprintf, int, +_GL_FUNCDECL_RPL (vasprintf, int, (char **result, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2)) @@ -1765,7 +1765,7 @@ _GL_CXXALIAS_RPL (vasprintf, int, (char **result, const char *format, va_list args)); # else # if !@HAVE_VASPRINTF@ -_GL_FUNCATTR_SYS (vasprintf, int, +_GL_FUNCDECL_SYS (vasprintf, int, (char **result, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2)) @@ -1785,7 +1785,7 @@ _GL_CXXALIASWARN (vasprintf); Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure codes are ENOMEM and the possible failure codes from write(), excluding EINTR. */ -_GL_FUNCATTR_SYS (vdzprintf, off64_t, +_GL_FUNCDECL_SYS (vdzprintf, off64_t, (int fd, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((2))); @@ -1801,7 +1801,7 @@ _GL_CXXALIAS_SYS (vdzprintf, off64_t, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define vdprintf rpl_vdprintf # endif -_GL_FUNCATTR_RPL (vdprintf, int, +_GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((2))); @@ -1809,7 +1809,7 @@ _GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *restrict format, va_list args)); # else # if !@HAVE_VDPRINTF@ -_GL_FUNCATTR_SYS (vdprintf, int, +_GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((2))); @@ -1838,7 +1838,7 @@ _GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - " Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCATTR_SYS (vfzprintf, off64_t, +_GL_FUNCDECL_SYS (vfzprintf, off64_t, (FILE *restrict fp, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) @@ -1859,13 +1859,13 @@ _GL_CXXALIAS_SYS (vfzprintf, off64_t, # endif # define GNULIB_overrides_vfprintf 1 # if @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCATTR_RPL (vfprintf, int, +_GL_FUNCDECL_RPL (vfprintf, int, (FILE *restrict fp, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); # else -_GL_FUNCATTR_RPL (vfprintf, int, +_GL_FUNCDECL_RPL (vfprintf, int, (FILE *restrict fp, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0) @@ -1902,7 +1902,7 @@ _GL_WARN_ON_USE (vfprintf, "vfprintf is not always POSIX compliant - " # undef vfscanf # define vfscanf rpl_vfscanf # endif -_GL_FUNCATTR_RPL (vfscanf, int, +_GL_FUNCDECL_RPL (vfscanf, int, (FILE *restrict stream, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0) @@ -1928,7 +1928,7 @@ _GL_CXXALIASWARN (vfscanf); Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCATTR_SYS (vzprintf, off64_t, +_GL_FUNCDECL_SYS (vzprintf, off64_t, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0) _GL_ARG_NONNULL ((1))); @@ -1947,11 +1947,11 @@ _GL_CXXALIAS_SYS (vzprintf, off64_t, # endif # define GNULIB_overrides_vprintf 1 # if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCATTR_RPL (vprintf, int, (const char *restrict format, va_list args), +_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0) _GL_ARG_NONNULL ((1))); # else -_GL_FUNCATTR_RPL (vprintf, int, (const char *restrict format, va_list args), +_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0) _GL_ARG_NONNULL ((1))); # endif @@ -1983,7 +1983,7 @@ _GL_WARN_ON_USE (vprintf, "vprintf is not always POSIX compliant - " # undef vscanf # define vscanf rpl_vscanf # endif -_GL_FUNCATTR_RPL (vscanf, int, (const char *restrict format, va_list args), +_GL_FUNCDECL_RPL (vscanf, int, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (vscanf, int, (const char *restrict format, va_list args)); @@ -2004,7 +2004,7 @@ _GL_CXXALIASWARN (vscanf); Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCATTR_SYS (vsnzprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (vsnzprintf, ptrdiff_t, (char *restrict str, size_t size, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) @@ -2025,7 +2025,7 @@ _GL_CXXALIAS_SYS (vsnzprintf, ptrdiff_t, # define vsnprintf rpl_vsnprintf # endif # define GNULIB_overrides_vsnprintf 1 -_GL_FUNCATTR_RPL (vsnprintf, int, +_GL_FUNCDECL_RPL (vsnprintf, int, (char *restrict str, size_t size, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) @@ -2035,7 +2035,7 @@ _GL_CXXALIAS_RPL (vsnprintf, int, const char *restrict format, va_list args)); # else # if !@HAVE_DECL_VSNPRINTF@ -_GL_FUNCATTR_SYS (vsnprintf, int, +_GL_FUNCDECL_SYS (vsnprintf, int, (char *restrict str, size_t size, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) @@ -2063,7 +2063,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCATTR_SYS (vszprintf, ptrdiff_t, +_GL_FUNCDECL_SYS (vszprintf, ptrdiff_t, (char *restrict str, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) @@ -2082,7 +2082,7 @@ _GL_CXXALIAS_SYS (vszprintf, ptrdiff_t, # define vsprintf rpl_vsprintf # endif # define GNULIB_overrides_vsprintf 1 -_GL_FUNCATTR_RPL (vsprintf, int, +_GL_FUNCDECL_RPL (vsprintf, int, (char *restrict str, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index d4607db732..e6c5123713 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -220,11 +220,11 @@ struct random_data # undef _Exit # define _Exit rpl__Exit # endif -_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status)); +_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status), ); _GL_CXXALIAS_RPL (_Exit, void, (int status)); # else # if !@HAVE__EXIT@ -_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status)); +_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status), ); # endif _GL_CXXALIAS_SYS (_Exit, void, (int status)); # endif @@ -249,7 +249,7 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " # undef abort # define abort rpl_abort # endif -_GL_FUNCDECL_RPL (abort, _Noreturn void, (void)); +_GL_FUNCDECL_RPL (abort, _Noreturn void, (void), ); _GL_CXXALIAS_RPL (abort, void, (void)); # else _GL_CXXALIAS_SYS (abort, void, (void)); @@ -267,9 +267,9 @@ _GL_CXXALIASWARN (abort); # define free rpl_free # endif # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_FUNCDECL_RPL (free, void, (void *ptr)) _GL_ATTRIBUTE_NOTHROW; +_GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_RPL (free, void, (void *ptr)); +_GL_FUNCDECL_RPL (free, void, (void *ptr), ); # endif _GL_CXXALIAS_RPL (free, void, (void *ptr)); # else @@ -293,7 +293,7 @@ _GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " # undef aligned_alloc # define aligned_alloc rpl_aligned_alloc # endif -_GL_FUNCATTR_RPL (aligned_alloc, void *, +_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -303,13 +303,13 @@ _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 -_GL_FUNCATTR_SYS (aligned_alloc, void *, +_GL_FUNCDECL_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (aligned_alloc, void *, +_GL_FUNCDECL_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -326,12 +326,12 @@ _GL_CXXALIASWARN (aligned_alloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined aligned_alloc /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 -_GL_FUNCATTR_SYS (aligned_alloc, void *, +_GL_FUNCDECL_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (aligned_alloc, void *, +_GL_FUNCDECL_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -349,7 +349,7 @@ _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " /* Parse a signed decimal integer. Returns the value of the integer. Errors are not detected. */ # if !@HAVE_ATOLL@ -_GL_FUNCATTR_SYS (atoll, long long, +_GL_FUNCDECL_SYS (atoll, long long, (const char *string), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); @@ -371,7 +371,7 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - " # undef calloc # define calloc rpl_calloc # endif -_GL_FUNCATTR_RPL (calloc, void *, +_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -380,13 +380,13 @@ _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (calloc, void *, +_GL_FUNCDECL_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (calloc, void *, +_GL_FUNCDECL_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -402,12 +402,12 @@ _GL_CXXALIASWARN (calloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined calloc /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (calloc, void *, +_GL_FUNCDECL_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (calloc, void *, +_GL_FUNCDECL_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -425,7 +425,7 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define canonicalize_file_name rpl_canonicalize_file_name # endif -_GL_FUNCATTR_RPL (canonicalize_file_name, char *, +_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE @@ -434,14 +434,14 @@ _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); # else # if !@HAVE_CANONICALIZE_FILE_NAME@ || (__GNUC__ >= 11 && !defined __clang__) # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (canonicalize_file_name, char *, +_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (canonicalize_file_name, char *, +_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE @@ -461,13 +461,13 @@ _GL_CXXALIASWARN (canonicalize_file_name); /* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (canonicalize_file_name, char *, +_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (canonicalize_file_name, char *, +_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -560,12 +560,12 @@ _GL_CXXALIASWARN (gcvt); # undef getloadavg # define getloadavg rpl_getloadavg # endif -_GL_FUNCATTR_RPL (getloadavg, int, (double loadavg[], int nelem), +_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg[], int nelem), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (getloadavg, int, (double loadavg[], int nelem)); # else # if !@HAVE_DECL_GETLOADAVG@ -_GL_FUNCATTR_SYS (getloadavg, int, (double loadavg[], int nelem), +_GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem)); @@ -590,17 +590,17 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - " # define getprogname rpl_getprogname # endif # if @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -_GL_FUNCATTR_RPL (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_RPL (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); # else -_GL_FUNCDECL_RPL (getprogname, const char *, (void)); +_GL_FUNCDECL_RPL (getprogname, const char *, (void), ); # endif _GL_CXXALIAS_RPL (getprogname, const char *, (void)); # else # if !@HAVE_GETPROGNAME@ # if @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -_GL_FUNCATTR_SYS (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); # else -_GL_FUNCDECL_SYS (getprogname, const char *, (void)); +_GL_FUNCDECL_SYS (getprogname, const char *, (void), ); # endif # endif _GL_CXXALIAS_SYS (getprogname, const char *, (void)); @@ -633,14 +633,14 @@ _GL_WARN_ON_USE (getprogname, "getprogname is unportable - " # undef getsubopt # define getsubopt rpl_getsubopt # endif -_GL_FUNCATTR_RPL (getsubopt, int, +_GL_FUNCDECL_RPL (getsubopt, int, (char **optionp, char *const *tokens, char **valuep), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getsubopt, int, (char **optionp, char *const *tokens, char **valuep)); # else # if !@HAVE_GETSUBOPT@ -_GL_FUNCATTR_SYS (getsubopt, int, +_GL_FUNCDECL_SYS (getsubopt, int, (char **optionp, char *const *tokens, char **valuep), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -662,7 +662,7 @@ _GL_WARN_ON_USE (getsubopt, "getsubopt is unportable - " /* Change the ownership and access permission of the slave side of the pseudo-terminal whose master side is specified by FD. */ # if !@HAVE_GRANTPT@ -_GL_FUNCDECL_SYS (grantpt, int, (int fd)); +_GL_FUNCDECL_SYS (grantpt, int, (int fd), ); # endif _GL_CXXALIAS_SYS (grantpt, int, (int fd)); _GL_CXXALIASWARN (grantpt); @@ -686,7 +686,7 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - " # undef malloc # define malloc rpl_malloc # endif -_GL_FUNCATTR_RPL (malloc, void *, +_GL_FUNCDECL_RPL (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -695,13 +695,13 @@ _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (malloc, void *, +_GL_FUNCDECL_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (malloc, void *, +_GL_FUNCDECL_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -717,12 +717,12 @@ _GL_CXXALIASWARN (malloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined malloc /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (malloc, void *, +_GL_FUNCDECL_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (malloc, void *, +_GL_FUNCDECL_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -757,7 +757,7 @@ int gl_MB_CUR_MAX (void) # undef mbstowcs # define mbstowcs rpl_mbstowcs # endif -_GL_FUNCATTR_RPL (mbstowcs, size_t, +_GL_FUNCDECL_RPL (mbstowcs, size_t, (wchar_t *restrict dest, const char *restrict src, size_t len), _GL_ARG_NONNULL ((2))); @@ -788,13 +788,13 @@ _GL_WARN_ON_USE (mbstowcs, "mbstowcs is unportable - " # define mbtowc rpl_mbtowc # endif _GL_FUNCDECL_RPL (mbtowc, int, - (wchar_t *restrict pwc, const char *restrict s, size_t n)); + (wchar_t *restrict pwc, const char *restrict s, size_t n), ); _GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *restrict pwc, const char *restrict s, size_t n)); # else # if !@HAVE_MBTOWC@ _GL_FUNCDECL_SYS (mbtowc, int, - (wchar_t *restrict pwc, const char *restrict s, size_t n)); + (wchar_t *restrict pwc, const char *restrict s, size_t n), ); # endif _GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *restrict pwc, const char *restrict s, size_t n)); @@ -817,7 +817,7 @@ _GL_WARN_ON_USE (mbtowc, "mbtowc is not portable - " Returns TEMPLATE, or a null pointer if it cannot get a unique name. The directory is created mode 700. */ # if !@HAVE_MKDTEMP@ -_GL_FUNCATTR_SYS (mkdtemp, char *, +_GL_FUNCDECL_SYS (mkdtemp, char *, (char * /*template*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -849,12 +849,12 @@ _GL_WARN_ON_USE (mkdtemp, "mkdtemp is unportable - " # undef mkostemp # define mkostemp rpl_mkostemp # endif -_GL_FUNCATTR_RPL (mkostemp, int, (char * /*template*/, int /*flags*/), +_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)); # else # if !@HAVE_MKOSTEMP@ -_GL_FUNCATTR_SYS (mkostemp, int, (char * /*template*/, int /*flags*/), +_GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)); @@ -889,14 +889,14 @@ _GL_WARN_ON_USE (mkostemp, "mkostemp is unportable - " # undef mkostemps # define mkostemps rpl_mkostemps # endif -_GL_FUNCATTR_RPL (mkostemps, int, +_GL_FUNCDECL_RPL (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/)); # else # if !@HAVE_MKOSTEMPS@ -_GL_FUNCATTR_SYS (mkostemps, int, +_GL_FUNCDECL_SYS (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -928,12 +928,12 @@ _GL_WARN_ON_USE (mkostemps, "mkostemps is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mkstemp rpl_mkstemp # endif -_GL_FUNCATTR_RPL (mkstemp, int, (char * /*template*/), +_GL_FUNCDECL_RPL (mkstemp, int, (char * /*template*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (mkstemp, int, (char * /*template*/)); # else # if ! @HAVE_MKSTEMP@ -_GL_FUNCATTR_SYS (mkstemp, int, (char * /*template*/), +_GL_FUNCDECL_SYS (mkstemp, int, (char * /*template*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (mkstemp, int, (char * /*template*/)); @@ -959,7 +959,7 @@ _GL_WARN_ON_USE (mkstemp, "mkstemp is unportable - " Returns the open file descriptor if successful, otherwise -1 and errno set. */ # if !@HAVE_MKSTEMPS@ -_GL_FUNCATTR_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/), +_GL_FUNCDECL_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/)); @@ -995,7 +995,7 @@ _GL_CXXALIASWARN (mktemp); # undef posix_memalign # define posix_memalign rpl_posix_memalign # endif -_GL_FUNCATTR_RPL (posix_memalign, int, +_GL_FUNCDECL_RPL (posix_memalign, int, (void **memptr, size_t alignment, size_t size), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (posix_memalign, int, @@ -1025,11 +1025,11 @@ _GL_WARN_ON_USE (posix_memalign, "posix_memalign is not portable - " # undef posix_openpt # define posix_openpt rpl_posix_openpt # endif -_GL_FUNCATTR_RPL (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCDECL_RPL (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (posix_openpt, int, (int flags)); # else # if !@HAVE_POSIX_OPENPT@ -_GL_FUNCATTR_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (posix_openpt, int, (int flags)); # endif @@ -1052,11 +1052,11 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - " # undef ptsname # define ptsname rpl_ptsname # endif -_GL_FUNCATTR_RPL (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCDECL_RPL (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ptsname, char *, (int fd)); # else # if !@HAVE_PTSNAME@ -_GL_FUNCATTR_SYS (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCDECL_SYS (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (ptsname, char *, (int fd)); # endif @@ -1078,11 +1078,11 @@ _GL_WARN_ON_USE (ptsname, "ptsname is not portable - " # undef ptsname_r # define ptsname_r rpl_ptsname_r # endif -_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len)); +_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len), ); _GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len)); # else # if !@HAVE_PTSNAME_R@ -_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len)); +_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len), ); # endif _GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len)); # endif @@ -1104,7 +1104,7 @@ _GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - " # undef putenv # define putenv rpl_putenv # endif -_GL_FUNCATTR_RPL (putenv, int, (char *string), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (putenv, int, (char *string), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (putenv, int, (char *string)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -1161,7 +1161,7 @@ typedef int (*_gl_qsort_r_compar_fn) (void const *, void const *, void *); # undef qsort_r # define qsort_r rpl_qsort_r # endif -_GL_FUNCATTR_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, +_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, _gl_qsort_r_compar_fn compare, void *arg), _GL_ARG_NONNULL ((1, 4))); @@ -1170,7 +1170,7 @@ _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, void *arg)); # else # if !@HAVE_QSORT_R@ -_GL_FUNCATTR_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, +_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, _gl_qsort_r_compar_fn compare, void *arg), _GL_ARG_NONNULL ((1, 4))); @@ -1204,7 +1204,7 @@ _GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - " # undef rand # define rand rpl_rand # endif -_GL_FUNCDECL_RPL (rand, int, (void)); +_GL_FUNCDECL_RPL (rand, int, (void), ); _GL_CXXALIAS_RPL (rand, int, (void)); # else _GL_CXXALIAS_SYS (rand, int, (void)); @@ -1221,11 +1221,11 @@ _GL_CXXALIASWARN (rand); # undef random # define random rpl_random # endif -_GL_FUNCDECL_RPL (random, long, (void)); +_GL_FUNCDECL_RPL (random, long, (void), ); _GL_CXXALIAS_RPL (random, long, (void)); # else # if !@HAVE_RANDOM@ -_GL_FUNCDECL_SYS (random, long, (void)); +_GL_FUNCDECL_SYS (random, long, (void), ); # endif /* Need to cast, because on Haiku, the return type is int. */ @@ -1248,11 +1248,11 @@ _GL_WARN_ON_USE (random, "random is unportable - " # undef srandom # define srandom rpl_srandom # endif -_GL_FUNCDECL_RPL (srandom, void, (unsigned int seed)); +_GL_FUNCDECL_RPL (srandom, void, (unsigned int seed), ); _GL_CXXALIAS_RPL (srandom, void, (unsigned int seed)); # else # if !@HAVE_RANDOM@ -_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed)); +_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed), ); # endif /* Need to cast, because on FreeBSD, the first parameter is unsigned long seed. */ @@ -1275,14 +1275,14 @@ _GL_WARN_ON_USE (srandom, "srandom is unportable - " # undef initstate # define initstate rpl_initstate # endif -_GL_FUNCATTR_RPL (initstate, char *, +_GL_FUNCDECL_RPL (initstate, char *, (unsigned int seed, char *buf, size_t buf_size), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (initstate, char *, (unsigned int seed, char *buf, size_t buf_size)); # else # if !@HAVE_INITSTATE@ || !@HAVE_DECL_INITSTATE@ -_GL_FUNCATTR_SYS (initstate, char *, +_GL_FUNCDECL_SYS (initstate, char *, (unsigned int seed, char *buf, size_t buf_size), _GL_ARG_NONNULL ((2))); # endif @@ -1308,11 +1308,11 @@ _GL_WARN_ON_USE (initstate, "initstate is unportable - " # undef setstate # define setstate rpl_setstate # endif -_GL_FUNCATTR_RPL (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (setstate, char *, (char *arg_state)); # else # if !@HAVE_SETSTATE@ || !@HAVE_DECL_SETSTATE@ -_GL_FUNCATTR_SYS (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on Mac OS X 10.13, HP-UX, Solaris the first parameter is const char *arg_state. */ @@ -1336,12 +1336,12 @@ _GL_WARN_ON_USE (setstate, "setstate is unportable - " # undef random_r # define random_r rpl_random_r # endif -_GL_FUNCATTR_RPL (random_r, int, (struct random_data *buf, int32_t *result), +_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCATTR_SYS (random_r, int, (struct random_data *buf, int32_t *result), +_GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result)); @@ -1361,14 +1361,14 @@ _GL_WARN_ON_USE (random_r, "random_r is unportable - " # undef srandom_r # define srandom_r rpl_srandom_r # endif -_GL_FUNCATTR_RPL (srandom_r, int, +_GL_FUNCDECL_RPL (srandom_r, int, (unsigned int seed, struct random_data *rand_state), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (srandom_r, int, (unsigned int seed, struct random_data *rand_state)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCATTR_SYS (srandom_r, int, +_GL_FUNCDECL_SYS (srandom_r, int, (unsigned int seed, struct random_data *rand_state), _GL_ARG_NONNULL ((2))); # endif @@ -1390,7 +1390,7 @@ _GL_WARN_ON_USE (srandom_r, "srandom_r is unportable - " # undef initstate_r # define initstate_r rpl_initstate_r # endif -_GL_FUNCATTR_RPL (initstate_r, int, +_GL_FUNCDECL_RPL (initstate_r, int, (unsigned int seed, char *buf, size_t buf_size, struct random_data *rand_state), _GL_ARG_NONNULL ((2, 4))); @@ -1399,7 +1399,7 @@ _GL_CXXALIAS_RPL (initstate_r, int, struct random_data *rand_state)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCATTR_SYS (initstate_r, int, +_GL_FUNCDECL_SYS (initstate_r, int, (unsigned int seed, char *buf, size_t buf_size, struct random_data *rand_state), _GL_ARG_NONNULL ((2, 4))); @@ -1425,14 +1425,14 @@ _GL_WARN_ON_USE (initstate_r, "initstate_r is unportable - " # undef setstate_r # define setstate_r rpl_setstate_r # endif -_GL_FUNCATTR_RPL (setstate_r, int, +_GL_FUNCDECL_RPL (setstate_r, int, (char *arg_state, struct random_data *rand_state), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (setstate_r, int, (char *arg_state, struct random_data *rand_state)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCATTR_SYS (setstate_r, int, +_GL_FUNCDECL_SYS (setstate_r, int, (char *arg_state, struct random_data *rand_state), _GL_ARG_NONNULL ((1, 2))); # endif @@ -1459,7 +1459,7 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - " # undef realloc # define realloc rpl_realloc # endif -_GL_FUNCATTR_RPL (realloc, void *, +_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); @@ -1467,12 +1467,12 @@ _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (realloc, void *, +_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (realloc, void *, +_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); # endif @@ -1487,12 +1487,12 @@ _GL_CXXALIASWARN (realloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined realloc /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCATTR_SYS (realloc, void *, +_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (realloc, void *, +_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1512,14 +1512,14 @@ _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " # undef reallocarray # define reallocarray rpl_reallocarray # endif -_GL_FUNCATTR_RPL (reallocarray, void *, +_GL_FUNCDECL_RPL (reallocarray, void *, (void *ptr, size_t nmemb, size_t size), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (reallocarray, void *, (void *ptr, size_t nmemb, size_t size)); # else # if ! @HAVE_REALLOCARRAY@ -_GL_FUNCATTR_SYS (reallocarray, void *, +_GL_FUNCDECL_SYS (reallocarray, void *, (void *ptr, size_t nmemb, size_t size), _GL_ATTRIBUTE_NODISCARD); # endif @@ -1542,14 +1542,14 @@ _GL_WARN_ON_USE (reallocarray, "reallocarray is not portable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define realpath rpl_realpath # endif -_GL_FUNCATTR_RPL (realpath, char *, +_GL_FUNCDECL_RPL (realpath, char *, (const char *restrict name, char *restrict resolved), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (realpath, char *, (const char *restrict name, char *restrict resolved)); # else # if !@HAVE_REALPATH@ -_GL_FUNCATTR_SYS (realpath, char *, +_GL_FUNCDECL_SYS (realpath, char *, (const char *restrict name, char *restrict resolved), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1569,7 +1569,7 @@ _GL_WARN_ON_USE (realpath, "realpath is unportable - use gnulib module " /* Test a user response to a question. Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear. */ # if !@HAVE_RPMATCH@ -_GL_FUNCATTR_SYS (rpmatch, int, (const char *response), +_GL_FUNCDECL_SYS (rpmatch, int, (const char *response), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (rpmatch, int, (const char *response)); @@ -1585,7 +1585,7 @@ _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - " #if @GNULIB_SECURE_GETENV@ /* Look up NAME in the environment, returning 0 in insecure situations. */ # if !@HAVE_SECURE_GETENV@ -_GL_FUNCATTR_SYS (secure_getenv, char *, +_GL_FUNCDECL_SYS (secure_getenv, char *, (char const *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1607,14 +1607,14 @@ _GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - " # undef setenv # define setenv rpl_setenv # endif -_GL_FUNCATTR_RPL (setenv, int, +_GL_FUNCDECL_RPL (setenv, int, (const char *name, const char *value, int replace), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (setenv, int, (const char *name, const char *value, int replace)); # else # if !@HAVE_DECL_SETENV@ -_GL_FUNCATTR_SYS (setenv, int, +_GL_FUNCDECL_SYS (setenv, int, (const char *name, const char *value, int replace), _GL_ARG_NONNULL ((1))); # endif @@ -1652,14 +1652,14 @@ _GL_EXTERN_C void print_stack_trace (void); # define strtod rpl_strtod # endif # define GNULIB_defined_strtod_function 1 -_GL_FUNCATTR_RPL (strtod, double, +_GL_FUNCDECL_RPL (strtod, double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtod, double, (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOD@ -_GL_FUNCATTR_SYS (strtod, double, +_GL_FUNCDECL_SYS (strtod, double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); # endif @@ -1684,14 +1684,14 @@ _GL_WARN_ON_USE (strtod, "strtod is unportable - " # define strtof rpl_strtof # endif # define GNULIB_defined_strtof_function 1 -_GL_FUNCATTR_RPL (strtof, float, +_GL_FUNCDECL_RPL (strtof, float, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtof, float, (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOF@ -_GL_FUNCATTR_SYS (strtof, float, +_GL_FUNCDECL_SYS (strtof, float, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); # endif @@ -1716,14 +1716,14 @@ _GL_WARN_ON_USE (strtof, "strtof is unportable - " # define strtold rpl_strtold # endif # define GNULIB_defined_strtold_function 1 -_GL_FUNCATTR_RPL (strtold, long double, +_GL_FUNCDECL_RPL (strtold, long double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtold, long double, (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOLD@ -_GL_FUNCATTR_SYS (strtold, long double, +_GL_FUNCDECL_SYS (strtold, long double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); # endif @@ -1753,7 +1753,7 @@ _GL_WARN_ON_USE (strtold, "strtold is unportable - " # define strtol rpl_strtol # endif # define GNULIB_defined_strtol_function 1 -_GL_FUNCATTR_RPL (strtol, long, +_GL_FUNCDECL_RPL (strtol, long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1762,7 +1762,7 @@ _GL_CXXALIAS_RPL (strtol, long, int base)); # else # if !@HAVE_STRTOL@ -_GL_FUNCATTR_SYS (strtol, long, +_GL_FUNCDECL_SYS (strtol, long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1796,7 +1796,7 @@ _GL_WARN_ON_USE (strtol, "strtol is unportable - " # define strtoll rpl_strtoll # endif # define GNULIB_defined_strtoll_function 1 -_GL_FUNCATTR_RPL (strtoll, long long, +_GL_FUNCDECL_RPL (strtoll, long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1805,7 +1805,7 @@ _GL_CXXALIAS_RPL (strtoll, long long, int base)); # else # if !@HAVE_STRTOLL@ -_GL_FUNCATTR_SYS (strtoll, long long, +_GL_FUNCDECL_SYS (strtoll, long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1836,7 +1836,7 @@ _GL_WARN_ON_USE (strtoll, "strtoll is unportable - " # define strtoul rpl_strtoul # endif # define GNULIB_defined_strtoul_function 1 -_GL_FUNCATTR_RPL (strtoul, unsigned long, +_GL_FUNCDECL_RPL (strtoul, unsigned long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1845,7 +1845,7 @@ _GL_CXXALIAS_RPL (strtoul, unsigned long, int base)); # else # if !@HAVE_STRTOUL@ -_GL_FUNCATTR_SYS (strtoul, unsigned long, +_GL_FUNCDECL_SYS (strtoul, unsigned long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1879,7 +1879,7 @@ _GL_WARN_ON_USE (strtoul, "strtoul is unportable - " # define strtoull rpl_strtoull # endif # define GNULIB_defined_strtoull_function 1 -_GL_FUNCATTR_RPL (strtoull, unsigned long long, +_GL_FUNCDECL_RPL (strtoull, unsigned long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1888,7 +1888,7 @@ _GL_CXXALIAS_RPL (strtoull, unsigned long long, int base)); # else # if !@HAVE_STRTOULL@ -_GL_FUNCATTR_SYS (strtoull, unsigned long long, +_GL_FUNCDECL_SYS (strtoull, unsigned long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1910,7 +1910,7 @@ _GL_WARN_ON_USE (strtoull, "strtoull is unportable - " /* Unlock the slave side of the pseudo-terminal whose master side is specified by FD, so that it can be opened. */ # if !@HAVE_UNLOCKPT@ -_GL_FUNCDECL_SYS (unlockpt, int, (int fd)); +_GL_FUNCDECL_SYS (unlockpt, int, (int fd), ); # endif _GL_CXXALIAS_SYS (unlockpt, int, (int fd)); _GL_CXXALIASWARN (unlockpt); @@ -1929,11 +1929,11 @@ _GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - " # undef unsetenv # define unsetenv rpl_unsetenv # endif -_GL_FUNCATTR_RPL (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (unsetenv, int, (const char *name)); # else # if !@HAVE_DECL_UNSETENV@ -_GL_FUNCATTR_SYS (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (unsetenv, int, (const char *name)); # endif @@ -1955,7 +1955,7 @@ _GL_WARN_ON_USE (unsetenv, "unsetenv is unportable - " # undef wctomb # define wctomb rpl_wctomb # endif -_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc)); +_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc), ); _GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc)); # else _GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc)); diff --git a/lib/string.in.h b/lib/string.in.h index 2f671bae07..f5a6d8b326 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -197,7 +197,7 @@ _GL_EXTERN_C void free (void *); this function, even if the block is dead after the call. */ #if @GNULIB_EXPLICIT_BZERO@ # if ! @HAVE_EXPLICIT_BZERO@ -_GL_FUNCATTR_SYS (explicit_bzero, void, +_GL_FUNCDECL_SYS (explicit_bzero, void, (void *__dest, size_t __n), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (explicit_bzero, void, (void *__dest, size_t __n)); @@ -213,7 +213,7 @@ _GL_WARN_ON_USE (explicit_bzero, "explicit_bzero is unportable - " /* Find the index of the least-significant set bit. */ #if @GNULIB_FFSL@ # if !@HAVE_FFSL@ -_GL_FUNCDECL_SYS (ffsl, int, (long int i)); +_GL_FUNCDECL_SYS (ffsl, int, (long int i), ); # endif _GL_CXXALIAS_SYS (ffsl, int, (long int i)); _GL_CXXALIASWARN (ffsl); @@ -231,11 +231,11 @@ _GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module"); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define ffsll rpl_ffsll # endif -_GL_FUNCDECL_RPL (ffsll, int, (long long int i)); +_GL_FUNCDECL_RPL (ffsll, int, (long long int i), ); _GL_CXXALIAS_RPL (ffsll, int, (long long int i)); # else # if !@HAVE_FFSLL@ -_GL_FUNCDECL_SYS (ffsll, int, (long long int i)); +_GL_FUNCDECL_SYS (ffsll, int, (long long int i), ); # endif _GL_CXXALIAS_SYS (ffsll, int, (long long int i)); # endif @@ -274,7 +274,7 @@ _GL_CXXALIASWARN (memccpy); # undef memchr # define memchr rpl_memchr # endif -_GL_FUNCATTR_RPL (memchr, void *, (void const *__s, int __c, size_t __n), +_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n)); @@ -311,7 +311,7 @@ _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define memmem rpl_memmem # endif -_GL_FUNCATTR_RPL (memmem, void *, +_GL_FUNCDECL_RPL (memmem, void *, (void const *__haystack, size_t __haystack_len, void const *__needle, size_t __needle_len), _GL_ATTRIBUTE_PURE @@ -321,7 +321,7 @@ _GL_CXXALIAS_RPL (memmem, void *, void const *__needle, size_t __needle_len)); # else # if ! @HAVE_DECL_MEMMEM@ -_GL_FUNCATTR_SYS (memmem, void *, +_GL_FUNCDECL_SYS (memmem, void *, (void const *__haystack, size_t __haystack_len, void const *__needle, size_t __needle_len), _GL_ATTRIBUTE_PURE @@ -349,7 +349,7 @@ _GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - " # undef mempcpy # define mempcpy rpl_mempcpy # endif -_GL_FUNCATTR_RPL (mempcpy, void *, +_GL_FUNCDECL_RPL (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -358,7 +358,7 @@ _GL_CXXALIAS_RPL (mempcpy, void *, size_t __n)); # else # if !@HAVE_MEMPCPY@ -_GL_FUNCATTR_SYS (mempcpy, void *, +_GL_FUNCDECL_SYS (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -381,7 +381,7 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is unportable - " /* Search backwards through a block for a byte (specified as an int). */ #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ -_GL_FUNCATTR_SYS (memrchr, void *, (void const *, int, size_t), +_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -419,12 +419,12 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - " # undef memset_explicit # define memset_explicit rpl_memset_explicit # endif -_GL_FUNCATTR_RPL (memset_explicit, void *, +_GL_FUNCDECL_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n)); # else # if !@HAVE_MEMSET_EXPLICIT@ -_GL_FUNCATTR_SYS (memset_explicit, void *, +_GL_FUNCDECL_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n)); @@ -443,7 +443,7 @@ _GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - " occur within N bytes. */ #if @GNULIB_RAWMEMCHR@ # if ! @HAVE_RAWMEMCHR@ -_GL_FUNCATTR_SYS (rawmemchr, void *, (void const *__s, int __c_in), +_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -480,14 +480,14 @@ _GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - " # undef stpcpy # define stpcpy rpl_stpcpy # endif -_GL_FUNCATTR_RPL (stpcpy, char *, +_GL_FUNCDECL_RPL (stpcpy, char *, (char *restrict __dst, char const *restrict __src), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (stpcpy, char *, (char *restrict __dst, char const *restrict __src)); # else # if !@HAVE_STPCPY@ -_GL_FUNCATTR_SYS (stpcpy, char *, +_GL_FUNCDECL_SYS (stpcpy, char *, (char *restrict __dst, char const *restrict __src), _GL_ARG_NONNULL ((1, 2))); # endif @@ -513,7 +513,7 @@ _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - " # undef stpncpy # define stpncpy rpl_stpncpy # endif -_GL_FUNCATTR_RPL (stpncpy, char *, +_GL_FUNCDECL_RPL (stpncpy, char *, (char *restrict __dst, char const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -522,7 +522,7 @@ _GL_CXXALIAS_RPL (stpncpy, char *, size_t __n)); # else # if ! @HAVE_STPNCPY@ -_GL_FUNCATTR_SYS (stpncpy, char *, +_GL_FUNCDECL_SYS (stpncpy, char *, (char *restrict __dst, char const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -560,14 +560,14 @@ _GL_WARN_ON_USE_CXX (strchr, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strchrnul rpl_strchrnul # endif -_GL_FUNCATTR_RPL (strchrnul, char *, (const char *__s, int __c_in), +_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strchrnul, char *, (const char *str, int ch)); # else # if ! @HAVE_STRCHRNUL@ -_GL_FUNCATTR_SYS (strchrnul, char *, (char const *__s, int __c_in), +_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -605,7 +605,7 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " # undef strdup # define strdup rpl_strdup # endif -_GL_FUNCATTR_RPL (strdup, char *, +_GL_FUNCDECL_RPL (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -624,13 +624,13 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); # if (!@HAVE_DECL_STRDUP@ || (__GNUC__ >= 11 && !defined __clang__)) \ && !defined strdup # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (strdup, char *, +_GL_FUNCDECL_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (strdup, char *, +_GL_FUNCDECL_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -643,13 +643,13 @@ _GL_CXXALIASWARN (strdup); # if (__GNUC__ >= 11 && !defined __clang__) && !defined strdup /* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (strdup, char *, +_GL_FUNCDECL_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (strdup, char *, +_GL_FUNCDECL_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -688,7 +688,7 @@ _GL_CXXALIASWARN (strdup); # undef strncat # define strncat rpl_strncat # endif -_GL_FUNCATTR_RPL (strncat, char *, +_GL_FUNCDECL_RPL (strncat, char *, (char *restrict dest, const char *restrict src, size_t n), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (strncat, char *, @@ -715,7 +715,7 @@ _GL_WARN_ON_USE (strncat, "strncat is unportable - " # undef strndup # define strndup rpl_strndup # endif -_GL_FUNCATTR_RPL (strndup, char *, +_GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -724,13 +724,13 @@ _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # if !@HAVE_DECL_STRNDUP@ \ || ((__GNUC__ >= 11 && !defined __clang__) && !defined strndup) # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (strndup, char *, +_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (strndup, char *, +_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -743,13 +743,13 @@ _GL_CXXALIASWARN (strndup); # if (__GNUC__ >= 11 && !defined __clang__) && !defined strndup /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (strndup, char *, +_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (strndup, char *, +_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -773,13 +773,13 @@ _GL_WARN_ON_USE (strndup, "strndup is unportable - " # undef strnlen # define strnlen rpl_strnlen # endif -_GL_FUNCATTR_RPL (strnlen, size_t, (char const *__s, size_t __maxlen), +_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)); # else # if ! @HAVE_DECL_STRNLEN@ -_GL_FUNCATTR_SYS (strnlen, size_t, (char const *__s, size_t __maxlen), +_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -809,7 +809,7 @@ _GL_WARN_ON_USE (strcspn, "strcspn cannot work correctly on character strings " /* Find the first occurrence in S of any character in ACCEPT. */ #if @GNULIB_STRPBRK@ # if ! @HAVE_STRPBRK@ -_GL_FUNCATTR_SYS (strpbrk, char *, (char const *__s, char const *__accept), +_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); # endif @@ -893,7 +893,7 @@ _GL_WARN_ON_USE_CXX (strrchr, See also strtok_r(). */ #if @GNULIB_STRSEP@ # if ! @HAVE_STRSEP@ -_GL_FUNCATTR_SYS (strsep, char *, +_GL_FUNCDECL_SYS (strsep, char *, (char **restrict __stringp, char const *restrict __delim), _GL_ARG_NONNULL ((1, 2))); # endif @@ -919,7 +919,7 @@ _GL_WARN_ON_USE (strsep, "strsep is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strstr rpl_strstr # endif -_GL_FUNCATTR_RPL (strstr, char *, (const char *haystack, const char *needle), +_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle)); @@ -964,7 +964,7 @@ _GL_WARN_ON_USE (strstr, "strstr is quadratic on many systems, and cannot " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strcasestr rpl_strcasestr # endif -_GL_FUNCATTR_RPL (strcasestr, char *, +_GL_FUNCDECL_RPL (strcasestr, char *, (const char *haystack, const char *needle), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); @@ -972,7 +972,7 @@ _GL_CXXALIAS_RPL (strcasestr, char *, (const char *haystack, const char *needle)); # else # if ! @HAVE_STRCASESTR@ -_GL_FUNCATTR_SYS (strcasestr, char *, +_GL_FUNCDECL_SYS (strcasestr, char *, (const char *haystack, const char *needle), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); @@ -1038,7 +1038,7 @@ _GL_WARN_ON_USE (strcasestr, "strcasestr does work correctly on character " # undef strtok_r # define strtok_r rpl_strtok_r # endif -_GL_FUNCATTR_RPL (strtok_r, char *, +_GL_FUNCDECL_RPL (strtok_r, char *, (char *restrict s, char const *restrict delim, char **restrict save_ptr), _GL_ARG_NONNULL ((2, 3))); @@ -1050,7 +1050,7 @@ _GL_CXXALIAS_RPL (strtok_r, char *, # undef strtok_r # endif # if ! @HAVE_DECL_STRTOK_R@ -_GL_FUNCATTR_SYS (strtok_r, char *, +_GL_FUNCDECL_SYS (strtok_r, char *, (char *restrict s, char const *restrict delim, char **restrict save_ptr), _GL_ARG_NONNULL ((2, 3))); @@ -1087,12 +1087,12 @@ _GL_WARN_ON_USE (strtok_r, "strtok_r is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbslen rpl_mbslen # endif -_GL_FUNCATTR_RPL (mbslen, size_t, (const char *string), +_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mbslen, size_t, (const char *string)); # else -_GL_FUNCATTR_SYS (mbslen, size_t, (const char *string), +_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string)); @@ -1119,12 +1119,12 @@ _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len) # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbschr rpl_mbschr /* avoid collision with HP-UX function */ # endif -_GL_FUNCATTR_RPL (mbschr, char *, (const char *string, int c), +_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c)); # else -_GL_FUNCATTR_SYS (mbschr, char *, (const char *string, int c), +_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c)); @@ -1141,12 +1141,12 @@ _GL_CXXALIASWARN (mbschr); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbsrchr rpl_mbsrchr /* avoid collision with system function */ # endif -_GL_FUNCATTR_RPL (mbsrchr, char *, (const char *string, int c), +_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c)); # else -_GL_FUNCATTR_SYS (mbsrchr, char *, (const char *string, int c), +_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c)); @@ -1236,12 +1236,12 @@ _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept) # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */ # endif -_GL_FUNCATTR_RPL (mbspbrk, char *, (const char *string, const char *accept), +_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept)); # else -_GL_FUNCATTR_SYS (mbspbrk, char *, (const char *string, const char *accept), +_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept)); @@ -1308,7 +1308,7 @@ _GL_EXTERN_C char * mbstok_r (char *restrict string, const char *delim, # undef strerror # define strerror rpl_strerror # endif -_GL_FUNCDECL_RPL (strerror, char *, (int)); +_GL_FUNCDECL_RPL (strerror, char *, (int), ); _GL_CXXALIAS_RPL (strerror, char *, (int)); # else _GL_CXXALIAS_SYS (strerror, char *, (int)); @@ -1331,12 +1331,12 @@ _GL_WARN_ON_USE (strerror, "strerror is unportable - " # undef strerror_r # define strerror_r rpl_strerror_r # endif -_GL_FUNCATTR_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen), +_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)); # else # if !@HAVE_DECL_STRERROR_R@ -_GL_FUNCATTR_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen), +_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)); @@ -1359,11 +1359,11 @@ _GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - " # undef strerrorname_np # define strerrorname_np rpl_strerrorname_np # endif -_GL_FUNCDECL_RPL (strerrorname_np, const char *, (int errnum)); +_GL_FUNCDECL_RPL (strerrorname_np, const char *, (int errnum), ); _GL_CXXALIAS_RPL (strerrorname_np, const char *, (int errnum)); # else # if !@HAVE_STRERRORNAME_NP@ -_GL_FUNCDECL_SYS (strerrorname_np, const char *, (int errnum)); +_GL_FUNCDECL_SYS (strerrorname_np, const char *, (int errnum), ); # endif _GL_CXXALIAS_SYS (strerrorname_np, const char *, (int errnum)); # endif @@ -1379,7 +1379,7 @@ _GL_WARN_ON_USE (strerrorname_np, "strerrorname_np is unportable - " /* Return an abbreviation string for the signal number SIG. */ #if @GNULIB_SIGABBREV_NP@ # if ! @HAVE_SIGABBREV_NP@ -_GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig)); +_GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig), ); # endif _GL_CXXALIAS_SYS (sigabbrev_np, const char *, (int sig)); _GL_CXXALIASWARN (sigabbrev_np); @@ -1394,7 +1394,7 @@ _GL_WARN_ON_USE (sigabbrev_np, "sigabbrev_np is unportable - " /* Return an English description string for the signal number SIG. */ #if @GNULIB_SIGDESCR_NP@ # if ! @HAVE_SIGDESCR_NP@ -_GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig)); +_GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig), ); # endif _GL_CXXALIAS_SYS (sigdescr_np, const char *, (int sig)); _GL_CXXALIASWARN (sigdescr_np); @@ -1411,11 +1411,11 @@ _GL_WARN_ON_USE (sigdescr_np, "sigdescr_np is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strsignal rpl_strsignal # endif -_GL_FUNCDECL_RPL (strsignal, char *, (int __sig)); +_GL_FUNCDECL_RPL (strsignal, char *, (int __sig), ); _GL_CXXALIAS_RPL (strsignal, char *, (int __sig)); # else # if ! @HAVE_DECL_STRSIGNAL@ -_GL_FUNCDECL_SYS (strsignal, char *, (int __sig)); +_GL_FUNCDECL_SYS (strsignal, char *, (int __sig), ); # endif /* Need to cast, because on Cygwin 1.5.x systems, the return type is 'const char *'. */ @@ -1435,13 +1435,13 @@ _GL_WARN_ON_USE (strsignal, "strsignal is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strverscmp rpl_strverscmp # endif -_GL_FUNCATTR_RPL (strverscmp, int, (const char *, const char *), +_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (strverscmp, int, (const char *, const char *)); # else # if !@HAVE_STRVERSCMP@ -_GL_FUNCATTR_SYS (strverscmp, int, (const char *, const char *), +_GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); # endif diff --git a/lib/strings.in.h b/lib/strings.in.h index 2b3e062a82..20bd6f1fa2 100644 --- a/lib/strings.in.h +++ b/lib/strings.in.h @@ -61,7 +61,7 @@ extern "C" { /* Find the index of the least-significant set bit. */ #if @GNULIB_FFS@ # if !@HAVE_FFS@ -_GL_FUNCDECL_SYS (ffs, int, (int i)); +_GL_FUNCDECL_SYS (ffs, int, (int i), ); # endif _GL_CXXALIAS_SYS (ffs, int, (int i)); _GL_CXXALIASWARN (ffs); diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h index 5d031da944..de31189c7e 100644 --- a/lib/sys_ioctl.in.h +++ b/lib/sys_ioctl.in.h @@ -56,13 +56,13 @@ # define ioctl rpl_ioctl # endif _GL_FUNCDECL_RPL (ioctl, int, - (int fd, int request, ... /* {void *,char *} arg */)); + (int fd, int request, ... /* {void *,char *} arg */), ); _GL_CXXALIAS_RPL (ioctl, int, (int fd, int request, ... /* {void *,char *} arg */)); # else # if @SYS_IOCTL_H_HAVE_WINSOCK2_H@ || 1 _GL_FUNCDECL_SYS (ioctl, int, - (int fd, int request, ... /* {void *,char *} arg */)); + (int fd, int request, ... /* {void *,char *} arg */), ); # endif _GL_CXXALIAS_SYS (ioctl, int, (int fd, int request, ... /* {void *,char *} arg */)); diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h index f02d097f9b..279ce62130 100644 --- a/lib/sys_random.in.h +++ b/lib/sys_random.in.h @@ -76,14 +76,14 @@ # undef getrandom # define getrandom rpl_getrandom # endif -_GL_FUNCATTR_RPL (getrandom, ssize_t, +_GL_FUNCDECL_RPL (getrandom, ssize_t, (void *buffer, size_t length, unsigned int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getrandom, ssize_t, (void *buffer, size_t length, unsigned int flags)); # else # if !@HAVE_GETRANDOM@ -_GL_FUNCATTR_SYS (getrandom, ssize_t, +_GL_FUNCDECL_SYS (getrandom, ssize_t, (void *buffer, size_t length, unsigned int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif diff --git a/lib/sys_resource.in.h b/lib/sys_resource.in.h index 7a435180db..0db80b2d88 100644 --- a/lib/sys_resource.in.h +++ b/lib/sys_resource.in.h @@ -110,7 +110,7 @@ struct rusage #if @GNULIB_GETRUSAGE@ # if !@HAVE_GETRUSAGE@ -_GL_FUNCATTR_SYS (getrusage, int, (int who, struct rusage *usage_p), +_GL_FUNCDECL_SYS (getrusage, int, (int who, struct rusage *usage_p), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (getrusage, int, (int who, struct rusage *usage_p)); diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 0d5ddd1678..9bfb228385 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -282,7 +282,7 @@ rpl_fd_isset (SOCKET fd, fd_set * set) # endif _GL_FUNCDECL_RPL (pselect, int, (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, - struct timespec const *restrict, const sigset_t *restrict)); + struct timespec const *restrict, const sigset_t *restrict), ); _GL_CXXALIAS_RPL (pselect, int, (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, struct timespec const *restrict, const sigset_t *restrict)); @@ -290,7 +290,7 @@ _GL_CXXALIAS_RPL (pselect, int, # if !@HAVE_PSELECT@ _GL_FUNCDECL_SYS (pselect, int, (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, - struct timespec const *restrict, const sigset_t *restrict)); + struct timespec const *restrict, const sigset_t *restrict), ); # endif /* Need to cast, because on AIX 7, the second, third, fourth argument may be void *restrict, void *restrict, void *restrict. */ @@ -319,7 +319,7 @@ _GL_WARN_ON_USE (pselect, "pselect is not portable - " # endif _GL_FUNCDECL_RPL (select, int, (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, - struct timeval *restrict)); + struct timeval *restrict), ); _GL_CXXALIAS_RPL (select, int, (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, timeval *restrict)); diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index 6fe8499398..2be986659f 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -289,7 +289,7 @@ rpl_fd_isset (SOCKET fd, fd_set * set) # undef socket # define socket rpl_socket # endif -_GL_FUNCDECL_RPL (socket, int, (int domain, int type, int protocol)); +_GL_FUNCDECL_RPL (socket, int, (int domain, int type, int protocol), ); _GL_CXXALIAS_RPL (socket, int, (int domain, int type, int protocol)); # else _GL_CXXALIAS_SYS (socket, int, (int domain, int type, int protocol)); @@ -314,7 +314,7 @@ _GL_WARN_ON_USE (socket, "socket is not always POSIX compliant - " # undef connect # define connect rpl_connect # endif -_GL_FUNCATTR_RPL (connect, int, +_GL_FUNCDECL_RPL (connect, int, (int fd, const struct sockaddr *addr, socklen_t addrlen), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (connect, int, @@ -349,7 +349,7 @@ _GL_WARN_ON_USE (connect, "connect is not always POSIX compliant - " _GL_FUNCDECL_RPL (accept, int, (int fd, struct sockaddr *restrict addr, - socklen_t *restrict addrlen)); + socklen_t *restrict addrlen), ); _GL_CXXALIAS_RPL (accept, int, (int fd, struct sockaddr *restrict addr, @@ -384,7 +384,7 @@ _GL_WARN_ON_USE (accept, "accept is not always POSIX compliant - " # undef bind # define bind rpl_bind # endif -_GL_FUNCATTR_RPL (bind, int, +_GL_FUNCDECL_RPL (bind, int, (int fd, const struct sockaddr *addr, socklen_t addrlen), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (bind, int, @@ -416,7 +416,7 @@ _GL_WARN_ON_USE (bind, "bind is not always POSIX compliant - " # undef getpeername # define getpeername rpl_getpeername # endif -_GL_FUNCATTR_RPL (getpeername, int, +_GL_FUNCDECL_RPL (getpeername, int, (int fd, struct sockaddr *restrict addr, socklen_t *restrict addrlen), _GL_ARG_NONNULL ((2, 3))); @@ -452,7 +452,7 @@ _GL_WARN_ON_USE (getpeername, "getpeername is not always POSIX compliant - " # undef getsockname # define getsockname rpl_getsockname # endif -_GL_FUNCATTR_RPL (getsockname, int, +_GL_FUNCDECL_RPL (getsockname, int, (int fd, struct sockaddr *restrict addr, socklen_t *restrict addrlen), _GL_ARG_NONNULL ((2, 3))); @@ -488,7 +488,7 @@ _GL_WARN_ON_USE (getsockname, "getsockname is not always POSIX compliant - " # undef getsockopt # define getsockopt rpl_getsockopt # endif -_GL_FUNCATTR_RPL (getsockopt, int, +_GL_FUNCDECL_RPL (getsockopt, int, (int fd, int level, int optname, void *restrict optval, socklen_t *restrict optlen), _GL_ARG_NONNULL ((4, 5))); @@ -522,7 +522,7 @@ _GL_WARN_ON_USE (getsockopt, "getsockopt is not always POSIX compliant - " # undef listen # define listen rpl_listen # endif -_GL_FUNCDECL_RPL (listen, int, (int fd, int backlog)); +_GL_FUNCDECL_RPL (listen, int, (int fd, int backlog), ); _GL_CXXALIAS_RPL (listen, int, (int fd, int backlog)); # else _GL_CXXALIAS_SYS (listen, int, (int fd, int backlog)); @@ -547,7 +547,7 @@ _GL_WARN_ON_USE (listen, "listen is not always POSIX compliant - " # undef recv # define recv rpl_recv # endif -_GL_FUNCATTR_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags), +_GL_FUNCDECL_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags)); # else @@ -576,7 +576,7 @@ _GL_WARN_ON_USE (recv, "recv is not always POSIX compliant - " # undef send # define send rpl_send # endif -_GL_FUNCATTR_RPL (send, ssize_t, +_GL_FUNCDECL_RPL (send, ssize_t, (int fd, const void *buf, size_t len, int flags), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (send, ssize_t, @@ -608,7 +608,7 @@ _GL_WARN_ON_USE (send, "send is not always POSIX compliant - " # undef recvfrom # define recvfrom rpl_recvfrom # endif -_GL_FUNCATTR_RPL (recvfrom, ssize_t, +_GL_FUNCDECL_RPL (recvfrom, ssize_t, (int fd, void *restrict buf, size_t len, int flags, struct sockaddr *restrict from, socklen_t *restrict fromlen), @@ -647,7 +647,7 @@ _GL_WARN_ON_USE (recvfrom, "recvfrom is not always POSIX compliant - " # undef sendto # define sendto rpl_sendto # endif -_GL_FUNCATTR_RPL (sendto, ssize_t, +_GL_FUNCDECL_RPL (sendto, ssize_t, (int fd, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen), _GL_ARG_NONNULL ((2))); @@ -681,7 +681,7 @@ _GL_WARN_ON_USE (sendto, "sendto is not always POSIX compliant - " # undef setsockopt # define setsockopt rpl_setsockopt # endif -_GL_FUNCATTR_RPL (setsockopt, int, (int fd, int level, int optname, +_GL_FUNCDECL_RPL (setsockopt, int, (int fd, int level, int optname, const void * optval, socklen_t optlen), _GL_ARG_NONNULL ((4))); _GL_CXXALIAS_RPL (setsockopt, int, (int fd, int level, int optname, @@ -713,7 +713,7 @@ _GL_WARN_ON_USE (setsockopt, "setsockopt is not always POSIX compliant - " # undef shutdown # define shutdown rpl_shutdown # endif -_GL_FUNCDECL_RPL (shutdown, int, (int fd, int how)); +_GL_FUNCDECL_RPL (shutdown, int, (int fd, int how), ); _GL_CXXALIAS_RPL (shutdown, int, (int fd, int how)); # else _GL_CXXALIAS_SYS (shutdown, int, (int fd, int how)); @@ -744,14 +744,14 @@ _GL_WARN_ON_USE (shutdown, "shutdown is not always POSIX compliant - " # endif _GL_FUNCDECL_RPL (accept4, int, (int sockfd, struct sockaddr *addr, socklen_t *addrlen, - int flags)); + int flags), ); _GL_CXXALIAS_RPL (accept4, int, (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)); # else _GL_FUNCDECL_SYS (accept4, int, (int sockfd, struct sockaddr *addr, socklen_t *addrlen, - int flags)); + int flags), ); _GL_CXXALIAS_SYS (accept4, int, (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)); diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 4df3bbd2cc..81138bce25 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -436,7 +436,7 @@ struct stat # undef chmod # define chmod rpl_chmod # endif -_GL_FUNCATTR_RPL (chmod, int, (const char *filename, mode_t mode), +_GL_FUNCDECL_RPL (chmod, int, (const char *filename, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (chmod, int, (const char *filename, mode_t mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -480,14 +480,14 @@ _GL_CXXALIASWARN (chmod); # undef fchmodat # define fchmodat rpl_fchmodat # endif -_GL_FUNCATTR_RPL (fchmodat, int, +_GL_FUNCDECL_RPL (fchmodat, int, (int fd, char const *file, mode_t mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fchmodat, int, (int fd, char const *file, mode_t mode, int flag)); # else # if !@HAVE_FCHMODAT@ -_GL_FUNCATTR_SYS (fchmodat, int, +_GL_FUNCDECL_SYS (fchmodat, int, (int fd, char const *file, mode_t mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -510,7 +510,7 @@ _GL_WARN_ON_USE (fchmodat, "fchmodat is not portable - " # undef fstat # define fstat rpl_fstat # endif -_GL_FUNCATTR_RPL (fstat, int, (int fd, struct stat *buf), +_GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf)); # else @@ -542,7 +542,7 @@ _GL_WARN_ON_USE (fstat, "fstat has portability problems - " # undef fstatat # define fstatat rpl_fstatat # endif -_GL_FUNCATTR_RPL (fstatat, int, +_GL_FUNCDECL_RPL (fstatat, int, (int fd, char const *restrict name, struct stat *restrict st, int flags), _GL_ARG_NONNULL ((2, 3))); @@ -551,7 +551,7 @@ _GL_CXXALIAS_RPL (fstatat, int, int flags)); # else # if !@HAVE_FSTATAT@ -_GL_FUNCATTR_SYS (fstatat, int, +_GL_FUNCDECL_SYS (fstatat, int, (int fd, char const *restrict name, struct stat *restrict st, int flags), _GL_ARG_NONNULL ((2, 3))); @@ -585,11 +585,11 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - " # undef futimens # define futimens rpl_futimens # endif -_GL_FUNCDECL_RPL (futimens, int, (int fd, struct timespec const times[2])); +_GL_FUNCDECL_RPL (futimens, int, (int fd, struct timespec const times[2]), ); _GL_CXXALIAS_RPL (futimens, int, (int fd, struct timespec const times[2])); # else # if !@HAVE_FUTIMENS@ -_GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2])); +_GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2]), ); # endif _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2])); # endif @@ -608,9 +608,9 @@ _GL_WARN_ON_USE (futimens, "futimens is not portable - " #if @GNULIB_GETUMASK@ # if !@HAVE_GETUMASK@ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (getumask, mode_t, (void)) _GL_ATTRIBUTE_NOTHROW; +_GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (getumask, mode_t, (void)); +_GL_FUNCDECL_SYS (getumask, mode_t, (void), ); # endif # endif _GL_CXXALIAS_SYS (getumask, mode_t, (void)); @@ -630,7 +630,7 @@ _GL_WARN_ON_USE (getumask, "getumask is not portable - " /* Change the mode of FILENAME to MODE, without dereferencing it if FILENAME denotes a symbolic link. */ # if !@HAVE_LCHMOD@ || defined __hpux -_GL_FUNCATTR_SYS (lchmod, int, (const char *filename, mode_t mode), +_GL_FUNCDECL_SYS (lchmod, int, (const char *filename, mode_t mode), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (lchmod, int, (const char *filename, mode_t mode)); @@ -650,7 +650,7 @@ _GL_WARN_ON_USE (lchmod, "lchmod is unportable - " # undef mkdir # define mkdir rpl_mkdir # endif -_GL_FUNCATTR_RPL (mkdir, int, (char const *name, mode_t mode), +_GL_FUNCDECL_RPL (mkdir, int, (char const *name, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -708,7 +708,7 @@ _GL_WARN_ON_USE (mkdir, "mkdir does not always support two parameters - " #if @GNULIB_MKDIRAT@ # if !@HAVE_MKDIRAT@ -_GL_FUNCATTR_SYS (mkdirat, int, (int fd, char const *file, mode_t mode), +_GL_FUNCDECL_SYS (mkdirat, int, (int fd, char const *file, mode_t mode), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (mkdirat, int, (int fd, char const *file, mode_t mode)); @@ -728,12 +728,12 @@ _GL_WARN_ON_USE (mkdirat, "mkdirat is not portable - " # undef mkfifo # define mkfifo rpl_mkfifo # endif -_GL_FUNCATTR_RPL (mkfifo, int, (char const *file, mode_t mode), +_GL_FUNCDECL_RPL (mkfifo, int, (char const *file, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mkfifo, int, (char const *file, mode_t mode)); # else # if !@HAVE_MKFIFO@ -_GL_FUNCATTR_SYS (mkfifo, int, (char const *file, mode_t mode), +_GL_FUNCDECL_SYS (mkfifo, int, (char const *file, mode_t mode), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mkfifo, int, (char const *file, mode_t mode)); @@ -754,12 +754,12 @@ _GL_WARN_ON_USE (mkfifo, "mkfifo is not portable - " # undef mkfifoat # define mkfifoat rpl_mkfifoat # endif -_GL_FUNCATTR_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode), +_GL_FUNCDECL_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode)); # else # if !@HAVE_MKFIFOAT@ -_GL_FUNCATTR_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode), +_GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)); @@ -782,12 +782,12 @@ _GL_WARN_ON_USE (mkfifoat, "mkfifoat is not portable - " # undef mknod # define mknod rpl_mknod # endif -_GL_FUNCATTR_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev), +_GL_FUNCDECL_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev)); # else # if !@HAVE_MKNOD@ -_GL_FUNCATTR_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev), +_GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on OSF/1 5.1, the third parameter is '...'. */ @@ -809,14 +809,14 @@ _GL_WARN_ON_USE (mknod, "mknod is not portable - " # undef mknodat # define mknodat rpl_mknodat # endif -_GL_FUNCATTR_RPL (mknodat, int, +_GL_FUNCDECL_RPL (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev)); # else # if !@HAVE_MKNODAT@ -_GL_FUNCATTR_SYS (mknodat, int, +_GL_FUNCDECL_SYS (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((2))); # endif @@ -923,7 +923,7 @@ _GL_CXXALIAS_RPL_1 (lstat, stat, int, # undef lstat # define lstat rpl_lstat # endif -_GL_FUNCATTR_RPL (lstat, int, +_GL_FUNCDECL_RPL (lstat, int, (const char *restrict name, struct stat *restrict buf), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (lstat, int, @@ -977,14 +977,14 @@ _GL_CXXALIASWARN (umask); # undef utimensat # define utimensat rpl_utimensat # endif -_GL_FUNCATTR_RPL (utimensat, int, (int fd, char const *name, +_GL_FUNCDECL_RPL (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag)); # else # if !@HAVE_UTIMENSAT@ -_GL_FUNCATTR_SYS (utimensat, int, (int fd, char const *name, +_GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 7944828e45..88e912e60e 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -104,14 +104,14 @@ struct timeval # undef gettimeofday # define gettimeofday rpl_gettimeofday # endif -_GL_FUNCATTR_RPL (gettimeofday, int, +_GL_FUNCDECL_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict)); # else # if !@HAVE_GETTIMEOFDAY@ -_GL_FUNCATTR_SYS (gettimeofday, int, +_GL_FUNCDECL_SYS (gettimeofday, int, (struct timeval *restrict, void *restrict), _GL_ARG_NONNULL ((1))); # endif diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h index 0d87631c0d..953a36621c 100644 --- a/lib/sys_wait.in.h +++ b/lib/sys_wait.in.h @@ -117,7 +117,7 @@ #if @GNULIB_WAITPID@ # if defined _WIN32 && ! defined __CYGWIN__ -_GL_FUNCDECL_SYS (waitpid, pid_t, (pid_t pid, int *statusp, int options)); +_GL_FUNCDECL_SYS (waitpid, pid_t, (pid_t pid, int *statusp, int options), ); # endif /* Need to cast, because on Cygwin, the second parameter is __wait_status_ptr_t statusp. */ diff --git a/lib/termios.in.h b/lib/termios.in.h index 173cb69786..e60737e731 100644 --- a/lib/termios.in.h +++ b/lib/termios.in.h @@ -78,7 +78,7 @@ struct winsize Return -1, with errno set, upon failure. errno = ENOSYS means that the function is unsupported. */ # if !@HAVE_DECL_TCGETSID@ -_GL_FUNCDECL_SYS (tcgetsid, pid_t, (int fd)); +_GL_FUNCDECL_SYS (tcgetsid, pid_t, (int fd), ); # endif _GL_CXXALIAS_SYS (tcgetsid, pid_t, (int fd)); _GL_CXXALIASWARN (tcgetsid); diff --git a/lib/threads.in.h b/lib/threads.in.h index 46b9343c74..91834d0788 100644 --- a/lib/threads.in.h +++ b/lib/threads.in.h @@ -163,12 +163,12 @@ typedef int (* thrd_start_t) (void *); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_create rpl_thrd_create # endif -_GL_FUNCATTR_RPL (thrd_create, int, (thrd_t *, thrd_start_t, void *), +_GL_FUNCDECL_RPL (thrd_create, int, (thrd_t *, thrd_start_t, void *), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (thrd_create, int, (thrd_t *, thrd_start_t, void *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (thrd_create, int, (thrd_t *, thrd_start_t, void *), +_GL_FUNCDECL_SYS (thrd_create, int, (thrd_t *, thrd_start_t, void *), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (thrd_create, int, (thrd_t *, thrd_start_t, void *)); @@ -187,11 +187,11 @@ _GL_WARN_ON_USE (thrd_create, "thrd_create is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_current rpl_thrd_current # endif -_GL_FUNCATTR_RPL (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_RPL (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (thrd_current, thrd_t, (void)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (thrd_current, thrd_t, (void)); # endif @@ -209,11 +209,11 @@ _GL_WARN_ON_USE (thrd_current, "thrd_current is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_equal rpl_thrd_equal # endif -_GL_FUNCATTR_RPL (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_RPL (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (thrd_equal, int, (thrd_t, thrd_t)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (thrd_equal, int, (thrd_t, thrd_t)); # endif @@ -231,14 +231,14 @@ _GL_WARN_ON_USE (thrd_equal, "thrd_equal is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_sleep rpl_thrd_sleep # endif -_GL_FUNCATTR_RPL (thrd_sleep, int, +_GL_FUNCDECL_RPL (thrd_sleep, int, (const struct timespec *, struct timespec *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (thrd_sleep, int, (const struct timespec *, struct timespec *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (thrd_sleep, int, +_GL_FUNCDECL_SYS (thrd_sleep, int, (const struct timespec *, struct timespec *), _GL_ARG_NONNULL ((1))); # endif @@ -259,11 +259,11 @@ _GL_WARN_ON_USE (thrd_sleep, "thrd_sleep is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_yield rpl_thrd_yield # endif -_GL_FUNCDECL_RPL (thrd_yield, void, (void)); +_GL_FUNCDECL_RPL (thrd_yield, void, (void), ); _GL_CXXALIAS_RPL (thrd_yield, void, (void)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_yield, void, (void)); +_GL_FUNCDECL_SYS (thrd_yield, void, (void), ); # endif _GL_CXXALIAS_SYS (thrd_yield, void, (void)); # endif @@ -281,11 +281,11 @@ _GL_WARN_ON_USE (thrd_yield, "thrd_yield is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_detach rpl_thrd_detach # endif -_GL_FUNCDECL_RPL (thrd_detach, int, (thrd_t)); +_GL_FUNCDECL_RPL (thrd_detach, int, (thrd_t), ); _GL_CXXALIAS_RPL (thrd_detach, int, (thrd_t)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_detach, int, (thrd_t)); +_GL_FUNCDECL_SYS (thrd_detach, int, (thrd_t), ); # endif _GL_CXXALIAS_SYS (thrd_detach, int, (thrd_t)); # endif @@ -303,11 +303,11 @@ _GL_WARN_ON_USE (thrd_detach, "thrd_detach is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_join rpl_thrd_join # endif -_GL_FUNCDECL_RPL (thrd_join, int, (thrd_t, int *)); +_GL_FUNCDECL_RPL (thrd_join, int, (thrd_t, int *), ); _GL_CXXALIAS_RPL (thrd_join, int, (thrd_t, int *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_join, int, (thrd_t, int *)); +_GL_FUNCDECL_SYS (thrd_join, int, (thrd_t, int *), ); # endif _GL_CXXALIAS_SYS (thrd_join, int, (thrd_t, int *)); # endif @@ -325,11 +325,11 @@ _GL_WARN_ON_USE (thrd_join, "thrd_join is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_exit rpl_thrd_exit # endif -_GL_FUNCDECL_RPL (thrd_exit, _Noreturn void, (int)); +_GL_FUNCDECL_RPL (thrd_exit, _Noreturn void, (int), ); _GL_CXXALIAS_RPL (thrd_exit, void, (int)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_exit, _Noreturn void, (int)); +_GL_FUNCDECL_SYS (thrd_exit, _Noreturn void, (int), ); # endif /* Need to cast because of AIX with xlclang++. */ _GL_CXXALIAS_SYS_CAST (thrd_exit, void, (int)); @@ -392,11 +392,11 @@ typedef pthread_mutex_t mtx_t; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_init rpl_mtx_init # endif -_GL_FUNCATTR_RPL (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_init, int, (mtx_t *, int)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_init, int, (mtx_t *, int)); # endif @@ -414,11 +414,11 @@ _GL_WARN_ON_USE (mtx_init, "mtx_init is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_lock rpl_mtx_lock # endif -_GL_FUNCATTR_RPL (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_lock, int, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_lock, int, (mtx_t *)); # endif @@ -436,11 +436,11 @@ _GL_WARN_ON_USE (mtx_lock, "mtx_lock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_trylock rpl_mtx_trylock # endif -_GL_FUNCATTR_RPL (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_trylock, int, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_trylock, int, (mtx_t *)); # endif @@ -458,12 +458,12 @@ _GL_WARN_ON_USE (mtx_trylock, "mtx_trylock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_timedlock rpl_mtx_timedlock # endif -_GL_FUNCATTR_RPL (mtx_timedlock, int, (mtx_t *, const struct timespec *), +_GL_FUNCDECL_RPL (mtx_timedlock, int, (mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (mtx_timedlock, int, (mtx_t *, const struct timespec *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (mtx_timedlock, int, (mtx_t *, const struct timespec *), +_GL_FUNCDECL_SYS (mtx_timedlock, int, (mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (mtx_timedlock, int, (mtx_t *, const struct timespec *)); @@ -482,11 +482,11 @@ _GL_WARN_ON_USE (mtx_timedlock, "mtx_timedlock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_unlock rpl_mtx_unlock # endif -_GL_FUNCATTR_RPL (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_unlock, int, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_unlock, int, (mtx_t *)); # endif @@ -504,11 +504,11 @@ _GL_WARN_ON_USE (mtx_unlock, "mtx_unlock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_destroy rpl_mtx_destroy # endif -_GL_FUNCATTR_RPL (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_destroy, void, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_destroy, void, (mtx_t *)); # endif @@ -550,12 +550,12 @@ typedef pthread_once_t once_flag; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define call_once rpl_call_once # endif -_GL_FUNCATTR_RPL (call_once, void, (once_flag *, void (*) (void)), +_GL_FUNCDECL_RPL (call_once, void, (once_flag *, void (*) (void)), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (call_once, void, (once_flag *, void (*) (void))); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (call_once, void, (once_flag *, void (*) (void)), +_GL_FUNCDECL_SYS (call_once, void, (once_flag *, void (*) (void)), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS_CAST (call_once, void, (once_flag *, void (*) (void))); @@ -595,11 +595,11 @@ typedef pthread_cond_t cnd_t; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_init rpl_cnd_init # endif -_GL_FUNCATTR_RPL (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_init, int, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_init, int, (cnd_t *)); # endif @@ -617,11 +617,11 @@ _GL_WARN_ON_USE (cnd_init, "cnd_init is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_wait rpl_cnd_wait # endif -_GL_FUNCATTR_RPL (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCDECL_RPL (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (cnd_wait, int, (cnd_t *, mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCDECL_SYS (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (cnd_wait, int, (cnd_t *, mtx_t *)); # endif @@ -639,14 +639,14 @@ _GL_WARN_ON_USE (cnd_wait, "cnd_wait is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_timedwait rpl_cnd_timedwait # endif -_GL_FUNCATTR_RPL (cnd_timedwait, int, +_GL_FUNCDECL_RPL (cnd_timedwait, int, (cnd_t *, mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2, 3))); _GL_CXXALIAS_RPL (cnd_timedwait, int, (cnd_t *, mtx_t *, const struct timespec *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (cnd_timedwait, int, +_GL_FUNCDECL_SYS (cnd_timedwait, int, (cnd_t *, mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2, 3))); # endif @@ -667,11 +667,11 @@ _GL_WARN_ON_USE (cnd_timedwait, "cnd_timedwait is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_signal rpl_cnd_signal # endif -_GL_FUNCATTR_RPL (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_signal, int, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_signal, int, (cnd_t *)); # endif @@ -689,11 +689,11 @@ _GL_WARN_ON_USE (cnd_signal, "cnd_signal is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_broadcast rpl_cnd_broadcast # endif -_GL_FUNCATTR_RPL (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_broadcast, int, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_broadcast, int, (cnd_t *)); # endif @@ -711,11 +711,11 @@ _GL_WARN_ON_USE (cnd_broadcast, "cnd_broadcast is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_destroy rpl_cnd_destroy # endif -_GL_FUNCATTR_RPL (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_destroy, void, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_destroy, void, (cnd_t *)); # endif @@ -771,12 +771,12 @@ typedef void (*tss_dtor_t) (void *); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tss_create rpl_tss_create # endif -_GL_FUNCATTR_RPL (tss_create, int, (tss_t *, tss_dtor_t), +_GL_FUNCDECL_RPL (tss_create, int, (tss_t *, tss_dtor_t), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (tss_create, int, (tss_t *, tss_dtor_t)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCATTR_SYS (tss_create, int, (tss_t *, tss_dtor_t), +_GL_FUNCDECL_SYS (tss_create, int, (tss_t *, tss_dtor_t), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (tss_create, int, (tss_t *, tss_dtor_t)); @@ -795,11 +795,11 @@ _GL_WARN_ON_USE (tss_create, "tss_create is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tss_set rpl_tss_set # endif -_GL_FUNCDECL_RPL (tss_set, int, (tss_t, void *)); +_GL_FUNCDECL_RPL (tss_set, int, (tss_t, void *), ); _GL_CXXALIAS_RPL (tss_set, int, (tss_t, void *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (tss_set, int, (tss_t, void *)); +_GL_FUNCDECL_SYS (tss_set, int, (tss_t, void *), ); # endif _GL_CXXALIAS_SYS (tss_set, int, (tss_t, void *)); # endif @@ -817,11 +817,11 @@ _GL_WARN_ON_USE (tss_set, "tss_set is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tss_get rpl_tss_get # endif -_GL_FUNCDECL_RPL (tss_get, void *, (tss_t)); +_GL_FUNCDECL_RPL (tss_get, void *, (tss_t), ); _GL_CXXALIAS_RPL (tss_get, void *, (tss_t)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (tss_get, void *, (tss_t)); +_GL_FUNCDECL_SYS (tss_get, void *, (tss_t), ); # endif _GL_CXXALIAS_SYS (tss_get, void *, (tss_t)); # endif @@ -839,11 +839,11 @@ _GL_WARN_ON_USE (tss_get, "tss_get is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tss_delete rpl_tss_delete # endif -_GL_FUNCDECL_RPL (tss_delete, void, (tss_t)); +_GL_FUNCDECL_RPL (tss_delete, void, (tss_t), ); _GL_CXXALIAS_RPL (tss_delete, void, (tss_t)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (tss_delete, void, (tss_t)); +_GL_FUNCDECL_SYS (tss_delete, void, (tss_t), ); # endif _GL_CXXALIAS_SYS (tss_delete, void, (tss_t)); # endif diff --git a/lib/time.in.h b/lib/time.in.h index c384bd37ab..5dc03c892a 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -147,12 +147,12 @@ extern # undef timespec_get # define timespec_get rpl_timespec_get # endif -_GL_FUNCATTR_RPL (timespec_get, int, (struct timespec *ts, int base), +_GL_FUNCDECL_RPL (timespec_get, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (timespec_get, int, (struct timespec *ts, int base)); # else # if !@HAVE_TIMESPEC_GET@ -_GL_FUNCATTR_SYS (timespec_get, int, (struct timespec *ts, int base), +_GL_FUNCDECL_SYS (timespec_get, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base)); @@ -176,12 +176,12 @@ _GL_WARN_ON_USE (timespec_get, "timespec_get is unportable - " # undef timespec_getres # define timespec_getres rpl_timespec_getres # endif -_GL_FUNCATTR_RPL (timespec_getres, int, (struct timespec *ts, int base), +_GL_FUNCDECL_RPL (timespec_getres, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (timespec_getres, int, (struct timespec *ts, int base)); # else # if !@HAVE_TIMESPEC_GETRES@ -_GL_FUNCATTR_SYS (timespec_getres, int, (struct timespec *ts, int base), +_GL_FUNCDECL_SYS (timespec_getres, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base)); @@ -201,7 +201,7 @@ _GL_WARN_ON_USE (timespec_getres, "timespec_getres is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define time rpl_time # endif -_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp)); +_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp), ); _GL_CXXALIAS_RPL (time, time_t, (time_t *__tp)); # else _GL_CXXALIAS_SYS (time, time_t, (time_t *__tp)); @@ -225,14 +225,14 @@ _GL_WARN_ON_USE (time, "time has consistency problems - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define nanosleep rpl_nanosleep # endif -_GL_FUNCATTR_RPL (nanosleep, int, +_GL_FUNCDECL_RPL (nanosleep, int, (struct timespec const *__rqtp, struct timespec *__rmtp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (nanosleep, int, (struct timespec const *__rqtp, struct timespec *__rmtp)); # else # if ! @HAVE_NANOSLEEP@ -_GL_FUNCATTR_SYS (nanosleep, int, +_GL_FUNCDECL_SYS (nanosleep, int, (struct timespec const *__rqtp, struct timespec *__rmtp), _GL_ARG_NONNULL ((1))); # endif @@ -255,7 +255,7 @@ _GL_WARN_ON_USE (nanosleep, "nanosleep is unportable - " # undef tzset # define tzset rpl_tzset # endif -_GL_FUNCDECL_RPL (tzset, void, (void)); +_GL_FUNCDECL_RPL (tzset, void, (void), ); _GL_CXXALIAS_RPL (tzset, void, (void)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -295,7 +295,7 @@ _GL_WARN_ON_USE (tzset, "tzset has portability problems - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mktime rpl_mktime # endif -_GL_FUNCATTR_RPL (mktime, time_t, (struct tm *__tp), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (mktime, time_t, (struct tm *__tp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp)); # else _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp)); @@ -320,14 +320,14 @@ _GL_WARN_ON_USE (mktime, "mktime has portability problems - " # undef localtime_r # define localtime_r rpl_localtime_r # endif -_GL_FUNCATTR_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # else # if ! @HAVE_DECL_LOCALTIME_R@ -_GL_FUNCATTR_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); # endif @@ -342,14 +342,14 @@ _GL_CXXALIASWARN (localtime_r); # undef gmtime_r # define gmtime_r rpl_gmtime_r # endif -_GL_FUNCATTR_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # else # if ! @HAVE_DECL_LOCALTIME_R@ -_GL_FUNCATTR_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); # endif @@ -381,7 +381,7 @@ _GL_WARN_ON_USE (gmtime_r, "gmtime_r is unportable - " # undef localtime # define localtime rpl_localtime # endif -_GL_FUNCATTR_RPL (localtime, struct tm *, (time_t const *__timer), +_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer)); # else @@ -404,7 +404,7 @@ _GL_WARN_ON_USE (localtime, "localtime has portability problems - " # undef gmtime # define gmtime rpl_gmtime # endif -_GL_FUNCATTR_RPL (gmtime, struct tm *, (time_t const *__timer), +_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer)); # else @@ -418,7 +418,7 @@ _GL_CXXALIASWARN (gmtime); . */ # if @GNULIB_STRPTIME@ # if ! @HAVE_STRPTIME@ -_GL_FUNCATTR_SYS (strptime, char *, (char const *restrict __buf, +_GL_FUNCDECL_SYS (strptime, char *, (char const *restrict __buf, char const *restrict __format, struct tm *restrict __tm), _GL_ARG_NONNULL ((1, 2, 3))); @@ -445,7 +445,7 @@ _GL_WARN_ON_USE (strptime, "strptime is unportable - " # ifndef __cplusplus _GL_ATTRIBUTE_DEPRECATED # endif -_GL_FUNCATTR_RPL (ctime, char *, (time_t const *__tp), +_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); # else @@ -465,7 +465,7 @@ _GL_CXXALIASWARN (ctime); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strftime rpl_strftime # endif -_GL_FUNCATTR_RPL (strftime, size_t, +_GL_FUNCDECL_RPL (strftime, size_t, (char *restrict __buf, size_t __bufsize, const char *restrict __fmt, const struct tm *restrict __tp), _GL_ARG_NONNULL ((1, 3, 4))); @@ -516,7 +516,7 @@ typedef struct tm_zone *rpl_timezone_t; May return NULL if NAME is invalid (this is platform dependent) or upon memory allocation failure. */ # if !@HAVE_TZALLOC@ -_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name)); +_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name), ); _GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name)); # endif @@ -524,7 +524,7 @@ _GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name)); Frees a time zone object. The argument must have been returned by tzalloc(). */ # if !@HAVE_TZALLOC@ -_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz)); +_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz), ); _GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); # endif @@ -538,7 +538,7 @@ _GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); # undef localtime_rz # define localtime_rz rpl_localtime_rz # endif -_GL_FUNCATTR_RPL (localtime_rz, struct tm *, +_GL_FUNCDECL_RPL (localtime_rz, struct tm *, (timezone_t __tz, time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((2, 3))); @@ -547,7 +547,7 @@ _GL_CXXALIAS_RPL (localtime_rz, struct tm *, struct tm *restrict __result)); # else # if !@HAVE_TZALLOC@ -_GL_FUNCATTR_SYS (localtime_rz, struct tm *, +_GL_FUNCDECL_SYS (localtime_rz, struct tm *, (timezone_t __tz, time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((2, 3))); @@ -567,14 +567,14 @@ _GL_CXXALIAS_SYS (localtime_rz, struct tm *, # undef mktime_z # define mktime_z rpl_mktime_z # endif -_GL_FUNCATTR_RPL (mktime_z, time_t, +_GL_FUNCDECL_RPL (mktime_z, time_t, (timezone_t __tz, struct tm *restrict __tm), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mktime_z, time_t, (timezone_t __tz, struct tm *restrict __tm)); # else # if !@HAVE_TZALLOC@ -_GL_FUNCATTR_SYS (mktime_z, time_t, +_GL_FUNCDECL_SYS (mktime_z, time_t, (timezone_t __tz, struct tm *restrict __tm), _GL_ARG_NONNULL ((2))); # endif @@ -597,11 +597,11 @@ _GL_CXXALIAS_SYS (mktime_z, time_t, # undef timegm # define timegm rpl_timegm # endif -_GL_FUNCATTR_RPL (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (timegm, time_t, (struct tm *__tm)); # else # if ! @HAVE_TIMEGM@ -_GL_FUNCATTR_SYS (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm)); # endif diff --git a/lib/uchar.in.h b/lib/uchar.in.h index d6e3fea6db..1b9487e39f 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -170,7 +170,7 @@ btoc32 (int c) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (btoc32, wint_t, (int c), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (btoc32, wint_t, (int c), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (btoc32, wint_t, (int c)); _GL_CXXALIASWARN (btoc32); @@ -192,7 +192,7 @@ c32isalnum (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isalnum, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isalnum, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isalnum, int, (wint_t wc)); _GL_CXXALIASWARN (c32isalnum); @@ -211,7 +211,7 @@ c32isalpha (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isalpha, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isalpha, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isalpha, int, (wint_t wc)); _GL_CXXALIASWARN (c32isalpha); @@ -230,7 +230,7 @@ c32isblank (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isblank, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isblank, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isblank, int, (wint_t wc)); _GL_CXXALIASWARN (c32isblank); @@ -249,7 +249,7 @@ c32iscntrl (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32iscntrl, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32iscntrl, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32iscntrl, int, (wint_t wc)); _GL_CXXALIASWARN (c32iscntrl); @@ -268,7 +268,7 @@ c32isdigit (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isdigit, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isdigit, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isdigit, int, (wint_t wc)); _GL_CXXALIASWARN (c32isdigit); @@ -287,7 +287,7 @@ c32isgraph (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isgraph, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isgraph, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isgraph, int, (wint_t wc)); _GL_CXXALIASWARN (c32isgraph); @@ -306,7 +306,7 @@ c32islower (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32islower, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32islower, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32islower, int, (wint_t wc)); _GL_CXXALIASWARN (c32islower); @@ -325,7 +325,7 @@ c32isprint (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isprint, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isprint, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isprint, int, (wint_t wc)); _GL_CXXALIASWARN (c32isprint); @@ -344,7 +344,7 @@ c32ispunct (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32ispunct, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32ispunct, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32ispunct, int, (wint_t wc)); _GL_CXXALIASWARN (c32ispunct); @@ -363,7 +363,7 @@ c32isspace (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isspace, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isspace, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isspace, int, (wint_t wc)); _GL_CXXALIASWARN (c32isspace); @@ -382,7 +382,7 @@ c32isupper (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isupper, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isupper, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isupper, int, (wint_t wc)); _GL_CXXALIASWARN (c32isupper); @@ -401,7 +401,7 @@ c32isxdigit (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32isxdigit, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32isxdigit, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32isxdigit, int, (wint_t wc)); _GL_CXXALIASWARN (c32isxdigit); @@ -423,7 +423,7 @@ c32tolower (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc)); +_GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32tolower, wint_t, (wint_t wc)); _GL_CXXALIASWARN (c32tolower); @@ -442,7 +442,7 @@ c32toupper (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc)); +_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32toupper, wint_t, (wint_t wc)); _GL_CXXALIASWARN (c32toupper); @@ -464,7 +464,7 @@ c32width (char32_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32width, int, (char32_t wc)); +_GL_FUNCDECL_SYS (c32width, int, (char32_t wc), ); # endif _GL_CXXALIAS_SYS (c32width, int, (char32_t wc)); _GL_CXXALIASWARN (c32width); @@ -478,11 +478,11 @@ _GL_CXXALIASWARN (c32width); # undef c32rtomb # define c32rtomb rpl_c32rtomb # endif -_GL_FUNCDECL_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); +_GL_FUNCDECL_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), ); _GL_CXXALIAS_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); # else # if !@HAVE_C32RTOMB@ -_GL_FUNCDECL_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); +_GL_FUNCDECL_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), ); # endif _GL_CXXALIAS_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps)); # endif @@ -514,7 +514,7 @@ c32snrtombs (char *dest, const char32_t **srcp, size_t srclen, size_t len, } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (c32snrtombs, size_t, +_GL_FUNCDECL_SYS (c32snrtombs, size_t, (char *dest, const char32_t **srcp, size_t srclen, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -541,7 +541,7 @@ c32srtombs (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (c32srtombs, size_t, +_GL_FUNCDECL_SYS (c32srtombs, size_t, (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -567,7 +567,7 @@ c32stombs (char *dest, const char32_t *src, size_t len) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (c32stombs, size_t, +_GL_FUNCDECL_SYS (c32stombs, size_t, (char *dest, const char32_t *src, size_t len), _GL_ARG_NONNULL ((2))); # endif @@ -592,7 +592,7 @@ c32swidth (const char32_t *s, size_t n) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (c32swidth, int, (const char32_t *s, size_t n), +_GL_FUNCDECL_SYS (c32swidth, int, (const char32_t *s, size_t n), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (c32swidth, int, (const char32_t *s, size_t n)); @@ -617,7 +617,7 @@ c32tob (wint_t wc) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32tob, int, (wint_t wc)); +_GL_FUNCDECL_SYS (c32tob, int, (wint_t wc), ); # endif _GL_CXXALIAS_SYS (c32tob, int, (wint_t wc)); _GL_CXXALIASWARN (c32tob); @@ -632,13 +632,13 @@ _GL_CXXALIASWARN (c32tob); # define mbrtoc32 rpl_mbrtoc32 # endif _GL_FUNCDECL_RPL (mbrtoc32, size_t, - (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); + (char32_t *pc, const char *s, size_t n, mbstate_t *ps), ); _GL_CXXALIAS_RPL (mbrtoc32, size_t, (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); # else # if !@HAVE_MBRTOC32@ _GL_FUNCDECL_SYS (mbrtoc32, size_t, - (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); + (char32_t *pc, const char *s, size_t n, mbstate_t *ps), ); # endif _GL_CXXALIAS_SYS (mbrtoc32, size_t, (char32_t *pc, const char *s, size_t n, mbstate_t *ps)); @@ -664,13 +664,13 @@ _GL_WARN_ON_USE (mbrtoc32, "mbrtoc32 is not portable - " # define mbrtoc16 rpl_mbrtoc16 # endif _GL_FUNCDECL_RPL (mbrtoc16, size_t, - (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); + (char16_t *pc, const char *s, size_t n, mbstate_t *ps), ); _GL_CXXALIAS_RPL (mbrtoc16, size_t, (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); # else # if !@HAVE_MBRTOC16@ _GL_FUNCDECL_SYS (mbrtoc16, size_t, - (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); + (char16_t *pc, const char *s, size_t n, mbstate_t *ps), ); # endif _GL_CXXALIAS_SYS (mbrtoc16, size_t, (char16_t *pc, const char *s, size_t n, mbstate_t *ps)); @@ -703,7 +703,7 @@ mbsnrtoc32s (char32_t *dest, const char **srcp, size_t srclen, size_t len, } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (mbsnrtoc32s, size_t, +_GL_FUNCDECL_SYS (mbsnrtoc32s, size_t, (char32_t *dest, const char **srcp, size_t srclen, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -730,7 +730,7 @@ mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (mbsrtoc32s, size_t, +_GL_FUNCDECL_SYS (mbsrtoc32s, size_t, (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -756,7 +756,7 @@ mbstoc32s (char32_t *dest, const char *src, size_t len) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (mbstoc32s, size_t, +_GL_FUNCDECL_SYS (mbstoc32s, size_t, (char32_t *dest, const char *src, size_t len), _GL_ARG_NONNULL ((2))); # endif @@ -798,7 +798,7 @@ c32_get_type_test (const char *name) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (c32_get_type_test, c32_type_test_t, (const char *name), +_GL_FUNCDECL_SYS (c32_get_type_test, c32_type_test_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (c32_get_type_test, c32_type_test_t, (const char *name)); @@ -826,10 +826,10 @@ c32_apply_type_test (wint_t wc, c32_type_test_t property) _GL_END_C_LINKAGE # else _GL_FUNCDECL_SYS (c32_apply_type_test, int, - (wint_t wc, c32_type_test_t property)); + (wint_t wc, c32_type_test_t property), ); # endif # else -_GL_FUNCATTR_SYS (c32_apply_type_test, int, +_GL_FUNCDECL_SYS (c32_apply_type_test, int, (wint_t wc, c32_type_test_t property), _GL_ARG_NONNULL ((2))); # endif @@ -870,7 +870,7 @@ c32_get_mapping (const char *name) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (c32_get_mapping, c32_mapping_t, (const char *name), +_GL_FUNCDECL_SYS (c32_get_mapping, c32_mapping_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (c32_get_mapping, c32_mapping_t, (const char *name)); @@ -896,7 +896,7 @@ c32_apply_mapping (wint_t wc, c32_mapping_t mapping) } _GL_END_C_LINKAGE # else -_GL_FUNCATTR_SYS (c32_apply_mapping, wint_t, +_GL_FUNCDECL_SYS (c32_apply_mapping, wint_t, (wint_t wc, c32_mapping_t mapping), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 47268d0b8f..20b1356fd3 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -287,7 +287,7 @@ _GL_INLINE_HEADER_BEGIN # undef access # define access rpl_access # endif -_GL_FUNCATTR_RPL (access, int, (const char *file, int mode), +_GL_FUNCDECL_RPL (access, int, (const char *file, int mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (access, int, (const char *file, int mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -371,12 +371,12 @@ _GL_CXXALIASWARN (chdir); # undef chown # define chown rpl_chown # endif -_GL_FUNCATTR_RPL (chown, int, (const char *file, uid_t uid, gid_t gid), +_GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, gid_t gid), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (chown, int, (const char *file, uid_t uid, gid_t gid)); # else # if !@HAVE_CHOWN@ -_GL_FUNCATTR_SYS (chown, int, (const char *file, uid_t uid, gid_t gid), +_GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (chown, int, (const char *file, uid_t uid, gid_t gid)); @@ -399,7 +399,7 @@ _GL_WARN_ON_USE (chown, "chown fails to follow symlinks on some systems and " # undef close # define close rpl_close # endif -_GL_FUNCDECL_RPL (close, int, (int fd)); +_GL_FUNCDECL_RPL (close, int, (int fd), ); _GL_CXXALIAS_RPL (close, int, (int fd)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -446,7 +446,7 @@ _GL_CXXALIASWARN (close); # endif _GL_FUNCDECL_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos, int ofd, off_t *opos, - size_t len, unsigned flags)); + size_t len, unsigned flags), ); _GL_CXXALIAS_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos, int ofd, off_t *opos, size_t len, unsigned flags)); @@ -454,7 +454,7 @@ _GL_CXXALIAS_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos, # if !@HAVE_COPY_FILE_RANGE@ _GL_FUNCDECL_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos, int ofd, off_t *opos, - size_t len, unsigned flags)); + size_t len, unsigned flags), ); # endif _GL_CXXALIAS_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos, int ofd, off_t *opos, @@ -476,7 +476,7 @@ _GL_WARN_ON_USE (copy_file_range, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dup rpl_dup # endif -_GL_FUNCATTR_RPL (dup, int, (int oldfd), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCDECL_RPL (dup, int, (int oldfd), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (dup, int, (int oldfd)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -521,7 +521,7 @@ _GL_CXXALIASWARN (dup); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dup2 rpl_dup2 # endif -_GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd)); +_GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd), ); _GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -570,11 +570,11 @@ _GL_CXXALIASWARN (dup2); # undef dup3 # define dup3 rpl_dup3 # endif -_GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags)); +_GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags), ); _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags)); # else # if !@HAVE_DUP3@ -_GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags)); +_GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags), ); # endif _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags)); # endif @@ -639,7 +639,7 @@ rpl_environ (void) /* Like access(), except that it uses the effective user id and group id of the current process. */ # if !@HAVE_EUIDACCESS@ -_GL_FUNCATTR_SYS (euidaccess, int, (const char *filename, int mode), +_GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (euidaccess, int, (const char *filename, int mode)); @@ -664,7 +664,7 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - " # undef execl # define execl rpl_execl # endif -_GL_FUNCATTR_RPL (execl, int, (const char *program, const char *arg, ...), +_GL_FUNCDECL_RPL (execl, int, (const char *program, const char *arg, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (execl, int, (const char *program, const char *arg, ...)); # else @@ -699,7 +699,7 @@ _GL_CXXALIASWARN (execl); # undef execle # define execle rpl_execle # endif -_GL_FUNCATTR_RPL (execle, int, (const char *program, const char *arg, ...), +_GL_FUNCDECL_RPL (execle, int, (const char *program, const char *arg, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (execle, int, (const char *program, const char *arg, ...)); # else @@ -735,7 +735,7 @@ _GL_CXXALIASWARN (execle); # undef execlp # define execlp rpl_execlp # endif -_GL_FUNCATTR_RPL (execlp, int, (const char *program, const char *arg, ...), +_GL_FUNCDECL_RPL (execlp, int, (const char *program, const char *arg, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (execlp, int, (const char *program, const char *arg, ...)); # else @@ -772,7 +772,7 @@ _GL_CXXALIASWARN (execlp); # undef execv # define execv rpl_execv # endif -_GL_FUNCATTR_RPL (execv, int, (const char *program, char * const *argv), +_GL_FUNCDECL_RPL (execv, int, (const char *program, char * const *argv), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execv, int, (const char *program, char * const *argv)); # else @@ -808,7 +808,7 @@ _GL_CXXALIASWARN (execv); # undef execve # define execve rpl_execve # endif -_GL_FUNCATTR_RPL (execve, int, +_GL_FUNCDECL_RPL (execve, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execve, int, @@ -849,7 +849,7 @@ _GL_CXXALIASWARN (execve); # undef execvp # define execvp rpl_execvp # endif -_GL_FUNCATTR_RPL (execvp, int, (const char *program, char * const *argv), +_GL_FUNCDECL_RPL (execvp, int, (const char *program, char * const *argv), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execvp, int, (const char *program, char * const *argv)); # else @@ -885,14 +885,14 @@ _GL_CXXALIASWARN (execvp); # undef execvpe # define execvpe rpl_execvpe # endif -_GL_FUNCATTR_RPL (execvpe, int, +_GL_FUNCDECL_RPL (execvpe, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execvpe, int, (const char *program, char * const *argv, char * const *env)); # else # if !@HAVE_DECL_EXECVPE@ -_GL_FUNCATTR_SYS (execvpe, int, +_GL_FUNCDECL_SYS (execvpe, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); # endif @@ -923,7 +923,7 @@ _GL_CXXALIAS_MDA_CAST (execvpe, intptr_t, char * const *env)); # elif @HAVE_EXECVPE@ # if !@HAVE_DECL_EXECVPE@ -_GL_FUNCATTR_SYS (execvpe, int, +_GL_FUNCDECL_SYS (execvpe, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); # endif @@ -942,14 +942,14 @@ _GL_CXXALIASWARN (execvpe); # undef faccessat # define faccessat rpl_faccessat # endif -_GL_FUNCATTR_RPL (faccessat, int, +_GL_FUNCDECL_RPL (faccessat, int, (int fd, char const *name, int mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (faccessat, int, (int fd, char const *name, int mode, int flag)); # else # if !@HAVE_FACCESSAT@ -_GL_FUNCATTR_SYS (faccessat, int, +_GL_FUNCDECL_SYS (faccessat, int, (int fd, char const *file, int mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -979,11 +979,11 @@ _GL_WARN_ON_USE (faccessat, "faccessat is not portable - " # undef fchdir # define fchdir rpl_fchdir # endif -_GL_FUNCATTR_RPL (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fchdir, int, (int /*fd*/)); # else # if !@HAVE_FCHDIR@ || !@HAVE_DECL_FCHDIR@ -_GL_FUNCATTR_SYS (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/)); # endif @@ -1011,14 +1011,14 @@ _GL_WARN_ON_USE (fchdir, "fchdir is unportable - " # undef fchownat # define fchownat rpl_fchownat # endif -_GL_FUNCATTR_RPL (fchownat, int, (int fd, char const *file, +_GL_FUNCDECL_RPL (fchownat, int, (int fd, char const *file, uid_t owner, gid_t group, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fchownat, int, (int fd, char const *file, uid_t owner, gid_t group, int flag)); # else # if !@HAVE_FCHOWNAT@ -_GL_FUNCATTR_SYS (fchownat, int, (int fd, char const *file, +_GL_FUNCDECL_SYS (fchownat, int, (int fd, char const *file, uid_t owner, gid_t group, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1045,11 +1045,11 @@ _GL_WARN_ON_USE (fchownat, "fchownat is not portable - " # undef fdatasync # define fdatasync rpl_fdatasync # endif -_GL_FUNCDECL_RPL (fdatasync, int, (int fd)); +_GL_FUNCDECL_RPL (fdatasync, int, (int fd), ); _GL_CXXALIAS_RPL (fdatasync, int, (int fd)); # else # if !@HAVE_FDATASYNC@|| !@HAVE_DECL_FDATASYNC@ -_GL_FUNCDECL_SYS (fdatasync, int, (int fd)); +_GL_FUNCDECL_SYS (fdatasync, int, (int fd), ); # endif _GL_CXXALIAS_SYS (fdatasync, int, (int fd)); # endif @@ -1071,7 +1071,7 @@ _GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - " See POSIX:2008 specification . */ # if !@HAVE_FSYNC@ -_GL_FUNCDECL_SYS (fsync, int, (int fd)); +_GL_FUNCDECL_SYS (fsync, int, (int fd), ); # endif _GL_CXXALIAS_SYS (fsync, int, (int fd)); _GL_CXXALIASWARN (fsync); @@ -1094,13 +1094,13 @@ _GL_WARN_ON_USE (fsync, "fsync is unportable - " # undef ftruncate # define ftruncate rpl_ftruncate # endif -_GL_FUNCATTR_RPL (ftruncate, int, +_GL_FUNCDECL_RPL (ftruncate, int, (int fd, off_t length), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length)); # else # if !@HAVE_FTRUNCATE@ -_GL_FUNCATTR_SYS (ftruncate, int, +_GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (ftruncate, int, @@ -1133,7 +1133,7 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define getcwd rpl_getcwd # endif -_GL_FUNCATTR_RPL (getcwd, char *, (char *buf, size_t size), +_GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getcwd, char *, (char *buf, size_t size)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -1189,14 +1189,14 @@ _GL_CXXALIASWARN (getcwd); # undef getdomainname # define getdomainname rpl_getdomainname # endif -_GL_FUNCATTR_RPL (getdomainname, int, +_GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len)); # else # if !@HAVE_DECL_GETDOMAINNAME@ -_GL_FUNCATTR_SYS (getdomainname, int, +_GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1223,11 +1223,11 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - " # undef getdtablesize # define getdtablesize rpl_getdtablesize # endif -_GL_FUNCDECL_RPL (getdtablesize, int, (void)); +_GL_FUNCDECL_RPL (getdtablesize, int, (void), ); _GL_CXXALIAS_RPL (getdtablesize, int, (void)); # else # if !@HAVE_GETDTABLESIZE@ -_GL_FUNCDECL_SYS (getdtablesize, int, (void)); +_GL_FUNCDECL_SYS (getdtablesize, int, (void), ); # endif /* Need to cast, because on AIX, the parameter list is (...). */ @@ -1250,13 +1250,13 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - " # undef getentropy # define getentropy rpl_getentropy # endif -_GL_FUNCATTR_RPL (getentropy, int, +_GL_FUNCDECL_RPL (getentropy, int, (void *buffer, size_t length), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getentropy, int, (void *buffer, size_t length)); # else # if !@HAVE_GETENTROPY@ -_GL_FUNCATTR_SYS (getentropy, int, +_GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (getentropy, int, @@ -1285,13 +1285,13 @@ _GL_WARN_ON_USE (getentropy, "getentropy is unportable - " # undef getgroups # define getgroups rpl_getgroups # endif -_GL_FUNCATTR_RPL (getgroups, int, +_GL_FUNCDECL_RPL (getgroups, int, (int n, gid_t *groups), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getgroups, int, (int n, gid_t *groups)); # else # if !@HAVE_GETGROUPS@ -_GL_FUNCATTR_SYS (getgroups, int, +_GL_FUNCDECL_SYS (getgroups, int, (int n, gid_t *groups), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (getgroups, int, @@ -1320,12 +1320,12 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - " # undef gethostname # define gethostname rpl_gethostname # endif -_GL_FUNCATTR_RPL (gethostname, int, (char *name, size_t len), +_GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len)); # else # if !@HAVE_GETHOSTNAME@ -_GL_FUNCATTR_SYS (gethostname, int, (char *name, size_t len), +_GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second @@ -1360,7 +1360,7 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable - " $USERNAME on native Windows platforms. */ # if !@HAVE_DECL_GETLOGIN@ -_GL_FUNCDECL_SYS (getlogin, char *, (void)); +_GL_FUNCDECL_SYS (getlogin, char *, (void), ); # endif _GL_CXXALIAS_SYS (getlogin, char *, (void)); _GL_CXXALIASWARN (getlogin); @@ -1392,12 +1392,12 @@ _GL_WARN_ON_USE (getlogin, "getlogin is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define getlogin_r rpl_getlogin_r # endif -_GL_FUNCATTR_RPL (getlogin_r, int, (char *name, size_t size), +_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size)); # else # if !@HAVE_DECL_GETLOGIN_R@ -_GL_FUNCATTR_SYS (getlogin_r, int, (char *name, size_t size), +_GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on Solaris 10 systems, the second argument is @@ -1421,13 +1421,13 @@ _GL_WARN_ON_USE (getlogin_r, "getlogin_r is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define getpagesize rpl_getpagesize # endif -_GL_FUNCDECL_RPL (getpagesize, int, (void)); +_GL_FUNCDECL_RPL (getpagesize, int, (void), ); _GL_CXXALIAS_RPL (getpagesize, int, (void)); # else /* On HP-UX, getpagesize exists, but it is not declared in even if the compiler options -D_HPUX_SOURCE -D_XOPEN_SOURCE=600 are used. */ # if defined __hpux -_GL_FUNCDECL_SYS (getpagesize, int, (void)); +_GL_FUNCDECL_SYS (getpagesize, int, (void), ); # endif # if !@HAVE_GETPAGESIZE@ # if !defined getpagesize @@ -1514,12 +1514,12 @@ _GL_WARN_ON_USE (getpagesize, "getpagesize is unportable - " # undef getpass # define getpass rpl_getpass # endif -_GL_FUNCATTR_RPL (getpass, char *, (const char *prompt), +_GL_FUNCDECL_RPL (getpass, char *, (const char *prompt), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (getpass, char *, (const char *prompt)); # else # if !@HAVE_GETPASS@ -_GL_FUNCATTR_SYS (getpass, char *, (const char *prompt), +_GL_FUNCDECL_SYS (getpass, char *, (const char *prompt), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (getpass, char *, (const char *prompt)); @@ -1559,11 +1559,11 @@ _GL_CXXALIASWARN (getpid); # undef getusershell # define getusershell rpl_getusershell # endif -_GL_FUNCDECL_RPL (getusershell, char *, (void)); +_GL_FUNCDECL_RPL (getusershell, char *, (void), ); _GL_CXXALIAS_RPL (getusershell, char *, (void)); # else # if !@HAVE_DECL_GETUSERSHELL@ -_GL_FUNCDECL_SYS (getusershell, char *, (void)); +_GL_FUNCDECL_SYS (getusershell, char *, (void), ); # endif _GL_CXXALIAS_SYS (getusershell, char *, (void)); # endif @@ -1583,11 +1583,11 @@ _GL_WARN_ON_USE (getusershell, "getusershell is unportable - " # undef setusershell # define setusershell rpl_setusershell # endif -_GL_FUNCDECL_RPL (setusershell, void, (void)); +_GL_FUNCDECL_RPL (setusershell, void, (void), ); _GL_CXXALIAS_RPL (setusershell, void, (void)); # else # if !@HAVE_DECL_GETUSERSHELL@ -_GL_FUNCDECL_SYS (setusershell, void, (void)); +_GL_FUNCDECL_SYS (setusershell, void, (void), ); # endif _GL_CXXALIAS_SYS (setusershell, void, (void)); # endif @@ -1608,11 +1608,11 @@ _GL_WARN_ON_USE (setusershell, "setusershell is unportable - " # undef endusershell # define endusershell rpl_endusershell # endif -_GL_FUNCDECL_RPL (endusershell, void, (void)); +_GL_FUNCDECL_RPL (endusershell, void, (void), ); _GL_CXXALIAS_RPL (endusershell, void, (void)); # else # if !@HAVE_DECL_GETUSERSHELL@ -_GL_FUNCDECL_SYS (endusershell, void, (void)); +_GL_FUNCDECL_SYS (endusershell, void, (void), ); # endif _GL_CXXALIAS_SYS (endusershell, void, (void)); # endif @@ -1629,7 +1629,7 @@ _GL_WARN_ON_USE (endusershell, "endusershell is unportable - " #if @GNULIB_GROUP_MEMBER@ /* Determine whether group id is in calling user's group list. */ # if !@HAVE_GROUP_MEMBER@ -_GL_FUNCDECL_SYS (group_member, int, (gid_t gid)); +_GL_FUNCDECL_SYS (group_member, int, (gid_t gid), ); # endif _GL_CXXALIAS_SYS (group_member, int, (gid_t gid)); _GL_CXXALIASWARN (group_member); @@ -1649,7 +1649,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " # define isatty rpl_isatty # endif # define GNULIB_defined_isatty 1 -_GL_FUNCDECL_RPL (isatty, int, (int fd)); +_GL_FUNCDECL_RPL (isatty, int, (int fd), ); _GL_CXXALIAS_RPL (isatty, int, (int fd)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -1695,12 +1695,12 @@ _GL_CXXALIASWARN (isatty); # undef lchown # define lchown rpl_lchown # endif -_GL_FUNCATTR_RPL (lchown, int, (char const *file, uid_t owner, gid_t group), +_GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t owner, gid_t group), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (lchown, int, (char const *file, uid_t owner, gid_t group)); # else # if !@HAVE_LCHOWN@ -_GL_FUNCATTR_SYS (lchown, int, (char const *file, uid_t owner, gid_t group), +_GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (lchown, int, (char const *file, uid_t owner, gid_t group)); @@ -1724,12 +1724,12 @@ _GL_WARN_ON_USE (lchown, "lchown is unportable to pre-POSIX.1-2001 systems - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define link rpl_link # endif -_GL_FUNCATTR_RPL (link, int, (const char *path1, const char *path2), +_GL_FUNCDECL_RPL (link, int, (const char *path1, const char *path2), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (link, int, (const char *path1, const char *path2)); # else # if !@HAVE_LINK@ -_GL_FUNCATTR_SYS (link, int, (const char *path1, const char *path2), +_GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (link, int, (const char *path1, const char *path2)); @@ -1753,7 +1753,7 @@ _GL_WARN_ON_USE (link, "link is unportable - " # undef linkat # define linkat rpl_linkat # endif -_GL_FUNCATTR_RPL (linkat, int, +_GL_FUNCDECL_RPL (linkat, int, (int fd1, const char *path1, int fd2, const char *path2, int flag), _GL_ARG_NONNULL ((2, 4)) _GL_ATTRIBUTE_NODISCARD); @@ -1762,7 +1762,7 @@ _GL_CXXALIAS_RPL (linkat, int, int flag)); # else # if !@HAVE_LINKAT@ -_GL_FUNCATTR_SYS (linkat, int, +_GL_FUNCDECL_SYS (linkat, int, (int fd1, const char *path1, int fd2, const char *path2, int flag), _GL_ARG_NONNULL ((2, 4)) _GL_ATTRIBUTE_NODISCARD); @@ -1792,7 +1792,7 @@ _GL_WARN_ON_USE (linkat, "linkat is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define lseek rpl_lseek # endif -_GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence)); +_GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence), ); _GL_CXXALIAS_RPL (lseek, off_t, (int fd, off_t offset, int whence)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -1832,7 +1832,7 @@ _GL_CXXALIASWARN (lseek); Store the read-end as fd[0] and the write-end as fd[1]. Return 0 upon success, or -1 with errno set upon failure. */ # if !@HAVE_PIPE@ -_GL_FUNCATTR_SYS (pipe, int, (int fd[2]), +_GL_FUNCDECL_SYS (pipe, int, (int fd[2]), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (pipe, int, (int fd[2])); @@ -1860,11 +1860,11 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - " # undef pipe2 # define pipe2 rpl_pipe2 # endif -_GL_FUNCATTR_RPL (pipe2, int, (int fd[2], int flags), +_GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags)); # else -_GL_FUNCATTR_SYS (pipe2, int, (int fd[2], int flags), +_GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags)); # endif @@ -1891,14 +1891,14 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unportable - " # undef pread # define pread rpl_pread # endif -_GL_FUNCATTR_RPL (pread, ssize_t, +_GL_FUNCDECL_RPL (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset)); # else # if !@HAVE_PREAD@ -_GL_FUNCATTR_SYS (pread, ssize_t, +_GL_FUNCDECL_SYS (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1928,14 +1928,14 @@ _GL_WARN_ON_USE (pread, "pread is unportable - " # undef pwrite # define pwrite rpl_pwrite # endif -_GL_FUNCATTR_RPL (pwrite, ssize_t, +_GL_FUNCDECL_RPL (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset)); # else # if !@HAVE_PWRITE@ -_GL_FUNCATTR_SYS (pwrite, ssize_t, +_GL_FUNCDECL_SYS (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1964,7 +1964,7 @@ _GL_WARN_ON_USE (pwrite, "pwrite is unportable - " # define read rpl_read # endif -_GL_FUNCATTR_RPL (read, ssize_t, (int fd, void *buf, size_t count), +_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -2004,7 +2004,7 @@ _GL_CXXALIASWARN (read); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define readlink rpl_readlink # endif -_GL_FUNCATTR_RPL (readlink, ssize_t, +_GL_FUNCDECL_RPL (readlink, ssize_t, (const char *restrict file, char *restrict buf, size_t bufsize), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); @@ -2013,7 +2013,7 @@ _GL_CXXALIAS_RPL (readlink, ssize_t, char *restrict buf, size_t bufsize)); # else # if !@HAVE_READLINK@ -_GL_FUNCATTR_SYS (readlink, ssize_t, +_GL_FUNCDECL_SYS (readlink, ssize_t, (const char *restrict file, char *restrict buf, size_t bufsize), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); @@ -2037,7 +2037,7 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define readlinkat rpl_readlinkat # endif -_GL_FUNCATTR_RPL (readlinkat, ssize_t, +_GL_FUNCDECL_RPL (readlinkat, ssize_t, (int fd, char const *restrict file, char *restrict buf, size_t len), _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -2046,7 +2046,7 @@ _GL_CXXALIAS_RPL (readlinkat, ssize_t, char *restrict buf, size_t len)); # else # if !@HAVE_READLINKAT@ -_GL_FUNCATTR_SYS (readlinkat, ssize_t, +_GL_FUNCDECL_SYS (readlinkat, ssize_t, (int fd, char const *restrict file, char *restrict buf, size_t len), _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -2073,7 +2073,7 @@ _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define rmdir rpl_rmdir # endif -_GL_FUNCATTR_RPL (rmdir, int, (char const *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (rmdir, int, (char const *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (rmdir, int, (char const *name)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -2122,14 +2122,14 @@ _GL_CXXALIASWARN (rmdir); # undef sethostname # define sethostname rpl_sethostname # endif -_GL_FUNCATTR_RPL (sethostname, int, +_GL_FUNCDECL_RPL (sethostname, int, (const char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (sethostname, int, (const char *name, size_t len)); # else # if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@ -_GL_FUNCATTR_SYS (sethostname, int, +_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2161,11 +2161,11 @@ _GL_WARN_ON_USE (sethostname, "sethostname is unportable - " # undef sleep # define sleep rpl_sleep # endif -_GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n)); +_GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n), ); _GL_CXXALIAS_RPL (sleep, unsigned int, (unsigned int n)); # else # if !@HAVE_SLEEP@ -_GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n)); +_GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n), ); # endif _GL_CXXALIAS_SYS (sleep, unsigned int, (unsigned int n)); # endif @@ -2210,14 +2210,14 @@ _GL_CXXALIASWARN (swab); # undef symlink # define symlink rpl_symlink # endif -_GL_FUNCATTR_RPL (symlink, int, +_GL_FUNCDECL_RPL (symlink, int, (char const *contents, char const *file), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (symlink, int, (char const *contents, char const *file)); # else # if !@HAVE_SYMLINK@ -_GL_FUNCATTR_SYS (symlink, int, +_GL_FUNCDECL_SYS (symlink, int, (char const *contents, char const *file), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2240,14 +2240,14 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - " # undef symlinkat # define symlinkat rpl_symlinkat # endif -_GL_FUNCATTR_RPL (symlinkat, int, +_GL_FUNCDECL_RPL (symlinkat, int, (char const *contents, int fd, char const *file), _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (symlinkat, int, (char const *contents, int fd, char const *file)); # else # if !@HAVE_SYMLINKAT@ -_GL_FUNCATTR_SYS (symlinkat, int, +_GL_FUNCDECL_SYS (symlinkat, int, (char const *contents, int fd, char const *file), _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2276,12 +2276,12 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - " # undef truncate # define truncate rpl_truncate # endif -_GL_FUNCATTR_RPL (truncate, int, (const char *filename, off_t length), +_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length)); # else # if !@HAVE_DECL_TRUNCATE@ -_GL_FUNCATTR_SYS (truncate, int, (const char *filename, off_t length), +_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); @@ -2306,14 +2306,14 @@ _GL_WARN_ON_USE (truncate, "truncate is unportable - " # undef ttyname_r # define ttyname_r rpl_ttyname_r # endif -_GL_FUNCATTR_RPL (ttyname_r, int, +_GL_FUNCDECL_RPL (ttyname_r, int, (int fd, char *buf, size_t buflen), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ttyname_r, int, (int fd, char *buf, size_t buflen)); # else # if !@HAVE_DECL_TTYNAME_R@ -_GL_FUNCATTR_SYS (ttyname_r, int, +_GL_FUNCDECL_SYS (ttyname_r, int, (int fd, char *buf, size_t buflen), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2338,7 +2338,7 @@ _GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - " # undef unlink # define unlink rpl_unlink # endif -_GL_FUNCATTR_RPL (unlink, int, (char const *file), _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_RPL (unlink, int, (char const *file), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (unlink, int, (char const *file)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -2379,12 +2379,12 @@ _GL_CXXALIASWARN (unlink); # undef unlinkat # define unlinkat rpl_unlinkat # endif -_GL_FUNCATTR_RPL (unlinkat, int, (int fd, char const *file, int flag), +_GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const *file, int flag), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (unlinkat, int, (int fd, char const *file, int flag)); # else # if !@HAVE_UNLINKAT@ -_GL_FUNCATTR_SYS (unlinkat, int, (int fd, char const *file, int flag), +_GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (unlinkat, int, (int fd, char const *file, int flag)); @@ -2409,11 +2409,11 @@ _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - " # undef usleep # define usleep rpl_usleep # endif -_GL_FUNCDECL_RPL (usleep, int, (useconds_t n)); +_GL_FUNCDECL_RPL (usleep, int, (useconds_t n), ); _GL_CXXALIAS_RPL (usleep, int, (useconds_t n)); # else # if !@HAVE_USLEEP@ -_GL_FUNCDECL_SYS (usleep, int, (useconds_t n)); +_GL_FUNCDECL_SYS (usleep, int, (useconds_t n), ); # endif /* Need to cast, because on Haiku, the first parameter is unsigned int n. */ @@ -2438,7 +2438,7 @@ _GL_WARN_ON_USE (usleep, "usleep is unportable - " # undef write # define write rpl_write # endif -_GL_FUNCATTR_RPL (write, ssize_t, +_GL_FUNCDECL_RPL (write, ssize_t, (int fd, const void *buf, size_t count), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (write, ssize_t, diff --git a/lib/utime.in.h b/lib/utime.in.h index fde6f9d10d..55b7ee8c94 100644 --- a/lib/utime.in.h +++ b/lib/utime.in.h @@ -71,7 +71,7 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define utime rpl_utime # endif -_GL_FUNCATTR_RPL (utime, int, (const char *filename, const struct utimbuf *ts), +_GL_FUNCDECL_RPL (utime, int, (const char *filename, const struct utimbuf *ts), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (utime, int, (const char *filename, const struct utimbuf *ts)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -82,7 +82,7 @@ _GL_CXXALIAS_RPL (utime, int, (const char *filename, const struct utimbuf *ts)); _GL_CXXALIAS_MDA (utime, int, (const char *filename, const struct utimbuf *ts)); # else # if !@HAVE_UTIME@ -_GL_FUNCATTR_SYS (utime, int, (const char *filename, const struct utimbuf *ts), +_GL_FUNCDECL_SYS (utime, int, (const char *filename, const struct utimbuf *ts), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (utime, int, (const char *filename, const struct utimbuf *ts)); diff --git a/lib/utmp.in.h b/lib/utmp.in.h index 7d0899d0d9..48567e67b8 100644 --- a/lib/utmp.in.h +++ b/lib/utmp.in.h @@ -62,11 +62,11 @@ # undef login_tty # define login_tty rpl_login_tty # endif -_GL_FUNCDECL_RPL (login_tty, int, (int fd)); +_GL_FUNCDECL_RPL (login_tty, int, (int fd), ); _GL_CXXALIAS_RPL (login_tty, int, (int fd)); # else # if !@HAVE_LOGIN_TTY@ -_GL_FUNCDECL_SYS (login_tty, int, (int fd)); +_GL_FUNCDECL_SYS (login_tty, int, (int fd), ); # endif _GL_CXXALIAS_SYS (login_tty, int, (int fd)); # endif diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 8cf956dd4c..54354559ef 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -269,11 +269,11 @@ _GL_EXTERN_C void free (void *); # undef btowc # define btowc rpl_btowc # endif -_GL_FUNCATTR_RPL (btowc, wint_t, (int c), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_RPL (btowc, wint_t, (int c), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (btowc, wint_t, (int c)); # else # if !@HAVE_BTOWC@ -_GL_FUNCATTR_SYS (btowc, wint_t, (int c), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (btowc, wint_t, (int c), _GL_ATTRIBUTE_PURE); # endif /* Need to cast, because on mingw, the return type is 'unsigned short'. */ _GL_CXXALIAS_SYS_CAST (btowc, wint_t, (int c)); @@ -297,12 +297,12 @@ _GL_WARN_ON_USE (btowc, "btowc is unportable - " # undef wctob # define wctob rpl_wctob # endif -_GL_FUNCATTR_RPL (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_RPL (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wctob, int, (wint_t wc)); # else # if !defined wctob && !@HAVE_DECL_WCTOB@ /* wctob is provided by gnulib, or wctob exists but is not declared. */ -_GL_FUNCATTR_SYS (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wctob, int, (wint_t wc)); # endif @@ -325,11 +325,11 @@ _GL_WARN_ON_USE (wctob, "wctob is unportable - " # undef mbsinit # define mbsinit rpl_mbsinit # endif -_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps)); +_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps), ); _GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps)); # else # if !@HAVE_MBSINIT@ -_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps)); +_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps), ); # endif _GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps)); # endif @@ -556,7 +556,7 @@ _GL_CXXALIASWARN (mbszero); # endif _GL_FUNCDECL_RPL (mbrtowc, size_t, (wchar_t *restrict pwc, const char *restrict s, size_t n, - mbstate_t *restrict ps)); + mbstate_t *restrict ps), ); _GL_CXXALIAS_RPL (mbrtowc, size_t, (wchar_t *restrict pwc, const char *restrict s, size_t n, mbstate_t *restrict ps)); @@ -564,7 +564,7 @@ _GL_CXXALIAS_RPL (mbrtowc, size_t, # if !@HAVE_MBRTOWC@ _GL_FUNCDECL_SYS (mbrtowc, size_t, (wchar_t *restrict pwc, const char *restrict s, size_t n, - mbstate_t *restrict ps)); + mbstate_t *restrict ps), ); # endif _GL_CXXALIAS_SYS (mbrtowc, size_t, (wchar_t *restrict pwc, const char *restrict s, size_t n, @@ -590,13 +590,13 @@ _GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - " # define mbrlen rpl_mbrlen # endif _GL_FUNCDECL_RPL (mbrlen, size_t, - (const char *restrict s, size_t n, mbstate_t *restrict ps)); + (const char *restrict s, size_t n, mbstate_t *restrict ps), ); _GL_CXXALIAS_RPL (mbrlen, size_t, (const char *restrict s, size_t n, mbstate_t *restrict ps)); # else # if !@HAVE_MBRLEN@ _GL_FUNCDECL_SYS (mbrlen, size_t, - (const char *restrict s, size_t n, mbstate_t *restrict ps)); + (const char *restrict s, size_t n, mbstate_t *restrict ps), ); # endif _GL_CXXALIAS_SYS (mbrlen, size_t, (const char *restrict s, size_t n, mbstate_t *restrict ps)); @@ -620,7 +620,7 @@ _GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - " # undef mbsrtowcs # define mbsrtowcs rpl_mbsrtowcs # endif -_GL_FUNCATTR_RPL (mbsrtowcs, size_t, +_GL_FUNCDECL_RPL (mbsrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -631,7 +631,7 @@ _GL_CXXALIAS_RPL (mbsrtowcs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_MBSRTOWCS@ -_GL_FUNCATTR_SYS (mbsrtowcs, size_t, +_GL_FUNCDECL_SYS (mbsrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -661,7 +661,7 @@ _GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - " # undef mbsnrtowcs # define mbsnrtowcs rpl_mbsnrtowcs # endif -_GL_FUNCATTR_RPL (mbsnrtowcs, size_t, +_GL_FUNCDECL_RPL (mbsnrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t srclen, size_t len, mbstate_t *restrict ps), @@ -672,7 +672,7 @@ _GL_CXXALIAS_RPL (mbsnrtowcs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_MBSNRTOWCS@ -_GL_FUNCATTR_SYS (mbsnrtowcs, size_t, +_GL_FUNCDECL_SYS (mbsnrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t srclen, size_t len, mbstate_t *restrict ps), @@ -703,13 +703,13 @@ _GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - " # define wcrtomb rpl_wcrtomb # endif _GL_FUNCDECL_RPL (wcrtomb, size_t, - (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); + (char *restrict s, wchar_t wc, mbstate_t *restrict ps), ); _GL_CXXALIAS_RPL (wcrtomb, size_t, (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); # else # if !@HAVE_WCRTOMB@ _GL_FUNCDECL_SYS (wcrtomb, size_t, - (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); + (char *restrict s, wchar_t wc, mbstate_t *restrict ps), ); # endif _GL_CXXALIAS_SYS (wcrtomb, size_t, (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); @@ -733,7 +733,7 @@ _GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - " # undef wcsrtombs # define wcsrtombs rpl_wcsrtombs # endif -_GL_FUNCATTR_RPL (wcsrtombs, size_t, +_GL_FUNCDECL_RPL (wcsrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -744,7 +744,7 @@ _GL_CXXALIAS_RPL (wcsrtombs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_WCSRTOMBS@ -_GL_FUNCATTR_SYS (wcsrtombs, size_t, +_GL_FUNCDECL_SYS (wcsrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -774,7 +774,7 @@ _GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - " # undef wcsnrtombs # define wcsnrtombs rpl_wcsnrtombs # endif -_GL_FUNCATTR_RPL (wcsnrtombs, size_t, +_GL_FUNCDECL_RPL (wcsnrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t srclen, size_t len, @@ -787,7 +787,7 @@ _GL_CXXALIAS_RPL (wcsnrtombs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_WCSNRTOMBS@ || (defined __cplusplus && defined __sun) -_GL_FUNCATTR_SYS (wcsnrtombs, size_t, +_GL_FUNCDECL_SYS (wcsnrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t srclen, size_t len, @@ -819,12 +819,12 @@ _GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - " # undef wcwidth # define wcwidth rpl_wcwidth # endif -_GL_FUNCATTR_RPL (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); # else # if !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ -_GL_FUNCATTR_SYS (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif @@ -843,7 +843,7 @@ _GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - " /* Search N wide characters of S for C. */ #if @GNULIB_WMEMCHR@ # if !@HAVE_WMEMCHR@ -_GL_FUNCATTR_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n), +_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n), _GL_ATTRIBUTE_PURE); # endif /* On some systems, this function is defined as an overloaded function: @@ -879,14 +879,14 @@ _GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - " # undef wmemcmp # define wmemcmp rpl_wmemcmp # endif -_GL_FUNCATTR_RPL (wmemcmp, int, +_GL_FUNCDECL_RPL (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); # else # if !@HAVE_WMEMCMP@ -_GL_FUNCATTR_SYS (wmemcmp, int, +_GL_FUNCDECL_SYS (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); # endif @@ -910,7 +910,7 @@ _GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - " # if !@HAVE_WMEMCPY@ _GL_FUNCDECL_SYS (wmemcpy, wchar_t *, (wchar_t *restrict dest, - const wchar_t *restrict src, size_t n)); + const wchar_t *restrict src, size_t n), ); # endif _GL_CXXALIAS_SYS (wmemcpy, wchar_t *, (wchar_t *restrict dest, @@ -932,7 +932,7 @@ _GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - " #if @GNULIB_WMEMMOVE@ # if !@HAVE_WMEMMOVE@ _GL_FUNCDECL_SYS (wmemmove, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *dest, const wchar_t *src, size_t n), ); # endif _GL_CXXALIAS_SYS (wmemmove, wchar_t *, (wchar_t *dest, const wchar_t *src, size_t n)); @@ -958,7 +958,7 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - " # endif _GL_FUNCDECL_RPL (wmempcpy, wchar_t *, (wchar_t *restrict dest, - const wchar_t *restrict src, size_t n)); + const wchar_t *restrict src, size_t n), ); _GL_CXXALIAS_RPL (wmempcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, size_t n)); @@ -966,7 +966,7 @@ _GL_CXXALIAS_RPL (wmempcpy, wchar_t *, # if !@HAVE_WMEMPCPY@ _GL_FUNCDECL_SYS (wmempcpy, wchar_t *, (wchar_t *restrict dest, - const wchar_t *restrict src, size_t n)); + const wchar_t *restrict src, size_t n), ); # endif _GL_CXXALIAS_SYS (wmempcpy, wchar_t *, (wchar_t *restrict dest, @@ -987,7 +987,7 @@ _GL_WARN_ON_USE (wmempcpy, "wmempcpy is unportable - " /* Set N wide characters of S to C. */ #if @GNULIB_WMEMSET@ # if !@HAVE_WMEMSET@ -_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n), ); # endif _GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); # if __GLIBC__ >= 2 @@ -1005,7 +1005,7 @@ _GL_WARN_ON_USE (wmemset, "wmemset is unportable - " /* Return the number of wide characters in S. */ #if @GNULIB_WCSLEN@ # if !@HAVE_WCSLEN@ -_GL_FUNCATTR_SYS (wcslen, size_t, (const wchar_t *s), _GL_ATTRIBUTE_PURE); +_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s)); # if __GLIBC__ >= 2 @@ -1026,7 +1026,7 @@ _GL_WARN_ON_USE (wcslen, "wcslen is unportable - " namespace, not in the global namespace. So, force a declaration in the global namespace. */ # if !@HAVE_WCSNLEN@ || (defined __sun && defined __cplusplus) -_GL_FUNCATTR_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen), +_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)); @@ -1044,7 +1044,7 @@ _GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - " #if @GNULIB_WCSCPY@ # if !@HAVE_WCSCPY@ _GL_FUNCDECL_SYS (wcscpy, wchar_t *, - (wchar_t *restrict dest, const wchar_t *restrict src)); + (wchar_t *restrict dest, const wchar_t *restrict src), ); # endif _GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src)); @@ -1067,7 +1067,7 @@ _GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - " the global namespace. */ # if !@HAVE_WCPCPY@ || (defined __sun && defined __cplusplus) _GL_FUNCDECL_SYS (wcpcpy, wchar_t *, - (wchar_t *restrict dest, const wchar_t *restrict src)); + (wchar_t *restrict dest, const wchar_t *restrict src), ); # endif _GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src)); @@ -1086,7 +1086,7 @@ _GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - " # if !@HAVE_WCSNCPY@ _GL_FUNCDECL_SYS (wcsncpy, wchar_t *, (wchar_t *restrict dest, - const wchar_t *restrict src, size_t n)); + const wchar_t *restrict src, size_t n), ); # endif _GL_CXXALIAS_SYS (wcsncpy, wchar_t *, (wchar_t *restrict dest, @@ -1112,7 +1112,7 @@ _GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - " # if !@HAVE_WCPNCPY@ || (defined __sun && defined __cplusplus) _GL_FUNCDECL_SYS (wcpncpy, wchar_t *, (wchar_t *restrict dest, - const wchar_t *restrict src, size_t n)); + const wchar_t *restrict src, size_t n), ); # endif _GL_CXXALIAS_SYS (wcpncpy, wchar_t *, (wchar_t *restrict dest, @@ -1131,7 +1131,7 @@ _GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - " #if @GNULIB_WCSCAT@ # if !@HAVE_WCSCAT@ _GL_FUNCDECL_SYS (wcscat, wchar_t *, - (wchar_t *restrict dest, const wchar_t *restrict src)); + (wchar_t *restrict dest, const wchar_t *restrict src), ); # endif _GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src)); @@ -1152,7 +1152,7 @@ _GL_WARN_ON_USE (wcscat, "wcscat is unportable - " # if !@HAVE_WCSNCAT@ _GL_FUNCDECL_SYS (wcsncat, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, - size_t n)); + size_t n), ); # endif _GL_CXXALIAS_SYS (wcsncat, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, @@ -1176,12 +1176,12 @@ _GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - " # undef wcscmp # define wcscmp rpl_wcscmp # endif -_GL_FUNCATTR_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), +_GL_FUNCDECL_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); # else # if !@HAVE_WCSCMP@ -_GL_FUNCATTR_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), +_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); @@ -1205,14 +1205,14 @@ _GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - " # undef wcsncmp # define wcsncmp rpl_wcsncmp # endif -_GL_FUNCATTR_RPL (wcsncmp, int, +_GL_FUNCDECL_RPL (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); # else # if !@HAVE_WCSNCMP@ -_GL_FUNCATTR_SYS (wcsncmp, int, +_GL_FUNCDECL_SYS (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); # endif @@ -1237,7 +1237,7 @@ _GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - " namespace, not in the global namespace. So, force a declaration in the global namespace. */ # if !@HAVE_WCSCASECMP@ || (defined __sun && defined __cplusplus) -_GL_FUNCATTR_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2), +_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); @@ -1257,7 +1257,7 @@ _GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - " namespace, not in the global namespace. So, force a declaration in the global namespace. */ # if !@HAVE_WCSNCASECMP@ || (defined __sun && defined __cplusplus) -_GL_FUNCATTR_SYS (wcsncasecmp, int, +_GL_FUNCDECL_SYS (wcsncasecmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); # endif @@ -1277,7 +1277,7 @@ _GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - " category of the current locale. */ #if @GNULIB_WCSCOLL@ # if !@HAVE_WCSCOLL@ -_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); +_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2), ); # endif _GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); # if __GLIBC__ >= 2 @@ -1298,7 +1298,7 @@ _GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - " #if @GNULIB_WCSXFRM@ # if !@HAVE_WCSXFRM@ _GL_FUNCDECL_SYS (wcsxfrm, size_t, - (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n)); + (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n), ); # endif _GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n)); @@ -1329,12 +1329,12 @@ _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); # if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) \ || (__GNUC__ >= 11 && !defined __clang__) # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (wcsdup, wchar_t *, +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (wcsdup, wchar_t *, +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1346,12 +1346,12 @@ _GL_CXXALIASWARN (wcsdup); # if (__GNUC__ >= 11 && !defined __clang__) && !defined wcsdup /* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (wcsdup, wchar_t *, +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (wcsdup, wchar_t *, +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1374,12 +1374,12 @@ _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); # else # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCATTR_SYS (wcsdup, wchar_t *, +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCATTR_SYS (wcsdup, wchar_t *, +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1397,7 +1397,7 @@ _GL_CXXALIASWARN (wcsdup); /* Find the first occurrence of WC in WCS. */ #if @GNULIB_WCSCHR@ # if !@HAVE_WCSCHR@ -_GL_FUNCATTR_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc), +_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc), _GL_ATTRIBUTE_PURE); # endif /* On some systems, this function is defined as an overloaded function: @@ -1428,7 +1428,7 @@ _GL_WARN_ON_USE (wcschr, "wcschr is unportable - " /* Find the last occurrence of WC in WCS. */ #if @GNULIB_WCSRCHR@ # if !@HAVE_WCSRCHR@ -_GL_FUNCATTR_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc), +_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc), _GL_ATTRIBUTE_PURE); # endif /* On some systems, this function is defined as an overloaded function: @@ -1460,7 +1460,7 @@ _GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - " of wide characters not in REJECT. */ #if @GNULIB_WCSCSPN@ # if !@HAVE_WCSCSPN@ -_GL_FUNCATTR_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject), +_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); @@ -1480,7 +1480,7 @@ _GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - " of wide characters in ACCEPT. */ #if @GNULIB_WCSSPN@ # if !@HAVE_WCSSPN@ -_GL_FUNCATTR_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept), +_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); @@ -1499,7 +1499,7 @@ _GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - " /* Find the first occurrence in WCS of any character in ACCEPT. */ #if @GNULIB_WCSPBRK@ # if !@HAVE_WCSPBRK@ -_GL_FUNCATTR_SYS (wcspbrk, wchar_t *, +_GL_FUNCDECL_SYS (wcspbrk, wchar_t *, (const wchar_t *wcs, const wchar_t *accept), _GL_ATTRIBUTE_PURE); # endif @@ -1537,7 +1537,7 @@ _GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - " # undef wcsstr # define wcsstr rpl_wcsstr # endif -_GL_FUNCATTR_RPL (wcsstr, wchar_t *, +_GL_FUNCDECL_RPL (wcsstr, wchar_t *, (const wchar_t *restrict haystack, const wchar_t *restrict needle), _GL_ATTRIBUTE_PURE); @@ -1546,7 +1546,7 @@ _GL_CXXALIAS_RPL (wcsstr, wchar_t *, const wchar_t *restrict needle)); # else # if !@HAVE_WCSSTR@ -_GL_FUNCATTR_SYS (wcsstr, wchar_t *, +_GL_FUNCDECL_SYS (wcsstr, wchar_t *, (const wchar_t *restrict haystack, const wchar_t *restrict needle), _GL_ATTRIBUTE_PURE); @@ -1592,7 +1592,7 @@ _GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - " # endif _GL_FUNCDECL_RPL (wcstok, wchar_t *, (wchar_t *restrict wcs, const wchar_t *restrict delim, - wchar_t **restrict ptr)); + wchar_t **restrict ptr), ); _GL_CXXALIAS_RPL (wcstok, wchar_t *, (wchar_t *restrict wcs, const wchar_t *restrict delim, wchar_t **restrict ptr)); @@ -1600,7 +1600,7 @@ _GL_CXXALIAS_RPL (wcstok, wchar_t *, # if !@HAVE_WCSTOK@ _GL_FUNCDECL_SYS (wcstok, wchar_t *, (wchar_t *restrict wcs, const wchar_t *restrict delim, - wchar_t **restrict ptr)); + wchar_t **restrict ptr), ); # endif _GL_CXXALIAS_SYS (wcstok, wchar_t *, (wchar_t *restrict wcs, const wchar_t *restrict delim, @@ -1626,12 +1626,12 @@ _GL_WARN_ON_USE (wcstok, "wcstok is unportable - " # undef wcswidth # define wcswidth rpl_wcswidth # endif -_GL_FUNCATTR_RPL (wcswidth, int, (const wchar_t *s, size_t n), +_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n)); # else # if !@HAVE_WCSWIDTH@ -_GL_FUNCATTR_SYS (wcswidth, int, (const wchar_t *s, size_t n), +_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n)); @@ -1656,7 +1656,7 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " # undef wcsftime # define wcsftime rpl_wcsftime # endif -_GL_FUNCATTR_RPL (wcsftime, size_t, +_GL_FUNCDECL_RPL (wcsftime, size_t, (wchar_t *restrict __buf, size_t __bufsize, const wchar_t *restrict __fmt, const struct tm *restrict __tp), @@ -1667,7 +1667,7 @@ _GL_CXXALIAS_RPL (wcsftime, size_t, const struct tm *restrict __tp)); # else # if !@HAVE_WCSFTIME@ -_GL_FUNCATTR_SYS (wcsftime, size_t, +_GL_FUNCDECL_SYS (wcsftime, size_t, (wchar_t *restrict __buf, size_t __bufsize, const wchar_t *restrict __fmt, const struct tm *restrict __tp), @@ -1704,7 +1704,7 @@ _GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - " Possible errno values include: - ERANGE if SIZE is too small. - ENOMEM if the memory could no be allocated. */ -_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size)); +_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size), ); #endif diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 11ac17bc46..3cb2e55c83 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -478,9 +478,9 @@ towupper # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define iswblank rpl_iswblank # endif -_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc)); +_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc), ); # else -_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); +_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc), ); # endif # endif @@ -490,7 +490,7 @@ _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); # undef iswdigit # define iswdigit rpl_iswdigit # endif -_GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc)); +_GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc), ); # endif # endif @@ -500,7 +500,7 @@ _GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc)); # undef iswpunct # define iswpunct rpl_iswpunct # endif -_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc)); +_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc), ); # endif # endif @@ -510,7 +510,7 @@ _GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc)); # undef iswxdigit # define iswxdigit rpl_iswxdigit # endif -_GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc)); +_GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc), ); # endif # endif @@ -659,12 +659,12 @@ typedef void *rpl_wctype_t; # undef wctype # define wctype rpl_wctype # endif -_GL_FUNCATTR_RPL (wctype, wctype_t, (const char *name), +_GL_FUNCDECL_RPL (wctype, wctype_t, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (wctype, wctype_t, (const char *name)); # else # if !@HAVE_WCTYPE_T@ -_GL_FUNCATTR_SYS (wctype, wctype_t, (const char *name), +_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); @@ -689,11 +689,11 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " # undef iswctype # define iswctype rpl_iswctype # endif -_GL_FUNCDECL_RPL (iswctype, int, (wint_t wc, wctype_t desc)); +_GL_FUNCDECL_RPL (iswctype, int, (wint_t wc, wctype_t desc), ); _GL_CXXALIAS_RPL (iswctype, int, (wint_t wc, wctype_t desc)); # else # if !@HAVE_WCTYPE_T@ -_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc)); +_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc), ); # endif _GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc)); # endif @@ -741,12 +741,12 @@ typedef void *rpl_wctrans_t; # undef wctrans # define wctrans rpl_wctrans # endif -_GL_FUNCATTR_RPL (wctrans, wctrans_t, (const char *name), +_GL_FUNCDECL_RPL (wctrans, wctrans_t, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (wctrans, wctrans_t, (const char *name)); # else # if !@HAVE_WCTRANS_T@ -_GL_FUNCATTR_SYS (wctrans, wctrans_t, (const char *name), +_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name)); @@ -771,11 +771,11 @@ _GL_WARN_ON_USE (wctrans, "wctrans is unportable - " # undef towctrans # define towctrans rpl_towctrans # endif -_GL_FUNCDECL_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +_GL_FUNCDECL_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc), ); _GL_CXXALIAS_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc)); # else # if !@HAVE_WCTRANS_T@ -_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc), ); # endif _GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); # endif -- 2.39.5