From f49438eeec49f12860582b7e2ff5fbdadcdc8b4a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jul 2024 00:51:27 +0200 Subject: [PATCH] Avoid false getpeername_used_without_requesting_gnulib_module_getpeername. * modules/getpeername (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (getpeername): Don't define to getpeername_used_without_requesting_gnulib_module_getpeername if the gnulib module 'getpeername' is in use under the same configure.ac. --- ChangeLog | 6 ++++++ lib/sys_socket.in.h | 6 ++++-- modules/getpeername | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9129eae652..6618271208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false getpeername_used_without_requesting_gnulib_module_getpeername. + * modules/getpeername (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_socket.in.h (getpeername): Don't define to + getpeername_used_without_requesting_gnulib_module_getpeername if the + gnulib module 'getpeername' is in use under the same configure.ac. + Avoid false bind_used_without_requesting_gnulib_module_bind. * modules/bind (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (bind): Don't define to diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index bc57bd2b9e..3898c6451d 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -434,8 +434,10 @@ _GL_CXXALIAS_SYS_CAST (getpeername, int, _GL_CXXALIASWARN (getpeername); # endif #elif @HAVE_WINSOCK2_H@ -# undef getpeername -# define getpeername getpeername_used_without_requesting_gnulib_module_getpeername +# if !GNULIB_GETPEERNAME +# undef getpeername +# define getpeername getpeername_used_without_requesting_gnulib_module_getpeername +# endif #elif defined GNULIB_POSIXCHECK # undef getpeername # if HAVE_RAW_DECL_GETPEERNAME diff --git a/modules/getpeername b/modules/getpeername index c0d7c997a2..0fd70eebcb 100644 --- a/modules/getpeername +++ b/modules/getpeername @@ -18,6 +18,7 @@ AC_REQUIRE([gl_SYS_SOCKET_H]) gl_CONDITIONAL([GL_COND_OBJ_GETPEERNAME], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([getpeername]) +gl_MODULE_INDICATOR([getpeername]) Makefile.am: if GL_COND_OBJ_GETPEERNAME -- 2.39.5