diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
commit | 1d8b9e17ea13630aec475484da09ebba0366f7c8 (patch) | |
tree | 0c801f68561bfb0930a4ade80d7ca3a7940887ab /tests/sys_select.in.h | |
parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/sys_select.in.h')
-rw-r--r-- | tests/sys_select.in.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/sys_select.in.h b/tests/sys_select.in.h index de29c779..9bfb2283 100644 --- a/tests/sys_select.in.h +++ b/tests/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)); @@ -328,10 +328,14 @@ _GL_CXXALIAS_SYS (select, int, (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, timeval *restrict)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (select); +# endif #elif @HAVE_WINSOCK2_H@ -# undef select -# define select select_used_without_requesting_gnulib_module_select +# if !GNULIB_SELECT +# undef select +# define select select_used_without_requesting_gnulib_module_select +# endif #elif defined GNULIB_POSIXCHECK # undef select # if HAVE_RAW_DECL_SELECT |