From 1b0b8ee8a872dc7a59d2a327e63a92f4b156394b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jul 2024 01:29:22 +0200 Subject: [PATCH] Avoid false select_used_without_requesting_gnulib_module_select. * modules/select (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_select.in.h (select): Don't define to select_used_without_requesting_gnulib_module_select if the gnulib module 'select' is in use under the same configure.ac. --- ChangeLog | 6 ++++++ lib/sys_select.in.h | 6 ++++-- modules/select | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index be36315416..bd7f42889e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false select_used_without_requesting_gnulib_module_select. + * modules/select (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_select.in.h (select): Don't define to + select_used_without_requesting_gnulib_module_select if the gnulib module + 'select' is in use under the same configure.ac. + Avoid false shutdown_used_without_requesting_gnulib_module_shutdown. * modules/shutdown (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (shutdown): Don't define to diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index ddf25d1de4..0d5ddd1678 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -332,8 +332,10 @@ _GL_CXXALIAS_SYS (select, int, _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 diff --git a/modules/select b/modules/select index 213fb78656..eb1d13bbb5 100644 --- a/modules/select +++ b/modules/select @@ -17,6 +17,7 @@ configure.ac: gl_FUNC_SELECT gl_CONDITIONAL([GL_COND_OBJ_SELECT], [test $REPLACE_SELECT = 1]) gl_SYS_SELECT_MODULE_INDICATOR([select]) +gl_MODULE_INDICATOR([select]) Makefile.am: if GL_COND_OBJ_SELECT -- 2.39.5