From 6fdafc46498c24a15e22fc00123af4d6e12e1484 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jul 2024 01:14:25 +0200 Subject: [PATCH] Avoid false listen_used_without_requesting_gnulib_module_listen. * modules/listen (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (listen): Don't define to listen_used_without_requesting_gnulib_module_listen if the gnulib module 'listen' is in use under the same configure.ac. --- ChangeLog | 6 ++++++ lib/sys_socket.in.h | 6 ++++-- modules/listen | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 665046327e..286fa75b9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false listen_used_without_requesting_gnulib_module_listen. + * modules/listen (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_socket.in.h (listen): Don't define to + listen_used_without_requesting_gnulib_module_listen if the gnulib module + 'listen' is in use under the same configure.ac. + Avoid false getsockopt_used_without_requesting_gnulib_module_getsockopt. * modules/getsockopt (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (getsockopt): Don't define to diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index ce217cdadb..a5e8ee63e7 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -529,8 +529,10 @@ _GL_CXXALIAS_SYS (listen, int, (int fd, int backlog)); # endif _GL_CXXALIASWARN (listen); #elif @HAVE_WINSOCK2_H@ -# undef listen -# define listen listen_used_without_requesting_gnulib_module_listen +# if !GNULIB_LISTEN +# undef listen +# define listen listen_used_without_requesting_gnulib_module_listen +# endif #elif defined GNULIB_POSIXCHECK # undef listen # if HAVE_RAW_DECL_LISTEN diff --git a/modules/listen b/modules/listen index 877bc14bdc..7eae89b361 100644 --- a/modules/listen +++ b/modules/listen @@ -15,6 +15,7 @@ configure.ac: AC_REQUIRE([gl_SYS_SOCKET_H]) gl_CONDITIONAL([GL_COND_OBJ_LISTEN], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([listen]) +gl_MODULE_INDICATOR([listen]) Makefile.am: if GL_COND_OBJ_LISTEN -- 2.39.5