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_ioctl.in.h | |
| parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
| parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/sys_ioctl.in.h')
| -rw-r--r-- | tests/sys_ioctl.in.h | 10 |
1 files changed, 6 insertions, 4 deletions
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 |