From 48f19cee29b2381eb93cf0c6619666e4bafcd5f7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jul 2024 01:23:52 +0200 Subject: [PATCH] Avoid false setsockopt_used_without_requesting_gnulib_module_setsockopt. * modules/setsockopt (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (setsockopt): Don't define to setsockopt_used_without_requesting_gnulib_module_setsockopt if the gnulib module 'setsockopt' is in use under the same configure.ac. --- ChangeLog | 6 ++++++ lib/sys_socket.in.h | 6 ++++-- modules/setsockopt | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5ab2db76c..9d6c85b8b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false setsockopt_used_without_requesting_gnulib_module_setsockopt. + * modules/setsockopt (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_socket.in.h (setsockopt): Don't define to + setsockopt_used_without_requesting_gnulib_module_setsockopt if the + gnulib module 'setsockopt' is in use under the same configure.ac. + Avoid false sendto_used_without_requesting_gnulib_module_sendto. * modules/sendto (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (sendto): Don't define to diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index 518a25e62c..2c7fdcf1a8 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -695,8 +695,10 @@ _GL_CXXALIAS_SYS_CAST (setsockopt, int, # endif _GL_CXXALIASWARN (setsockopt); #elif @HAVE_WINSOCK2_H@ -# undef setsockopt -# define setsockopt setsockopt_used_without_requesting_gnulib_module_setsockopt +# if !GNULIB_SETSOCKOPT +# undef setsockopt +# define setsockopt setsockopt_used_without_requesting_gnulib_module_setsockopt +# endif #elif defined GNULIB_POSIXCHECK # undef setsockopt # if HAVE_RAW_DECL_SETSOCKOPT diff --git a/modules/setsockopt b/modules/setsockopt index 1b1bdad069..efa55be536 100644 --- a/modules/setsockopt +++ b/modules/setsockopt @@ -17,6 +17,7 @@ AC_REQUIRE([gl_SYS_SOCKET_H]) gl_CONDITIONAL([GL_COND_OBJ_SETSOCKOPT], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) +gl_MODULE_INDICATOR([setsockopt]) Makefile.am: if GL_COND_OBJ_SETSOCKOPT -- 2.39.5