From 4682deeb62247d34de87f8e777f99e2d337fd377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 20 Oct 2024 15:21:43 +0200 Subject: New upstream version 1.3 --- tests/sys_ioctl.in.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/sys_ioctl.in.h') diff --git a/tests/sys_ioctl.in.h b/tests/sys_ioctl.in.h index 787d35f7..de31189c 100644 --- a/tests/sys_ioctl.in.h +++ b/tests/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 */)); @@ -71,8 +71,10 @@ _GL_CXXALIAS_SYS (ioctl, int, _GL_CXXALIASWARN (ioctl); # endif #elif @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -# undef ioctl -# define ioctl ioctl_used_without_requesting_gnulib_module_ioctl +# if !GNULIB_IOCTL +# undef ioctl +# define ioctl ioctl_used_without_requesting_gnulib_module_ioctl +# endif #elif defined GNULIB_POSIXCHECK # undef ioctl # if HAVE_RAW_DECL_IOCTL -- cgit v1.2.3