From 07faf2898cfa3ab7369bb31cbdbd98e0d7363019 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 24 Jul 2024 23:59:15 +0200 Subject: [PATCH] Avoid false ioctl_used_without_requesting_gnulib_module_ioctl. * modules/ioctl (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_ioctl.in.h (ioctl): Don't define to ioctl_used_without_requesting_gnulib_module_ioctl if the gnulib module 'ioctl' is in use under the same configure.ac. --- ChangeLog | 6 ++++++ lib/sys_ioctl.in.h | 6 ++++-- modules/ioctl | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd3087ad71..3a42e52487 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false ioctl_used_without_requesting_gnulib_module_ioctl. + * modules/ioctl (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_ioctl.in.h (ioctl): Don't define to + ioctl_used_without_requesting_gnulib_module_ioctl if the gnulib module + 'ioctl' is in use under the same configure.ac. + Avoid false localeconv_used_without_requesting_gnulib_module_localeconv. * modules/localeconv (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/locale.in.h (localeconv): Don't define to diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h index 787d35f75b..5d031da944 100644 --- a/lib/sys_ioctl.in.h +++ b/lib/sys_ioctl.in.h @@ -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 diff --git a/modules/ioctl b/modules/ioctl index a862891bc6..422f25d776 100644 --- a/modules/ioctl +++ b/modules/ioctl @@ -18,6 +18,7 @@ gl_FUNC_IOCTL gl_CONDITIONAL([GL_COND_OBJ_IOCTL], [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]) gl_SYS_IOCTL_MODULE_INDICATOR([ioctl]) +gl_MODULE_INDICATOR([ioctl]) Makefile.am: if GL_COND_OBJ_IOCTL -- 2.39.5