From f8bda7bb5cc3c3dc6514f3a9baacaf874f0e8020 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jul 2024 00:53:05 +0200 Subject: [PATCH] Avoid false getsockname_used_without_requesting_gnulib_module_getsockname. * modules/getsockname (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_socket.in.h (getsockname): Don't define to getsockname_used_without_requesting_gnulib_module_getsockname if the gnulib module 'getsockname' is in use under the same configure.ac. --- ChangeLog | 6 ++++++ lib/sys_socket.in.h | 6 ++++-- modules/getsockname | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7be549b6c..9a48a5e070 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false getsockname_used_without_requesting_gnulib_module_getsockname. + * modules/getsockname (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_socket.in.h (getsockname): Don't define to + getsockname_used_without_requesting_gnulib_module_getsockname if the + gnulib module 'getsockname' is in use under the same configure.ac. + 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 diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index 3898c6451d..f19403d1f0 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -470,8 +470,10 @@ _GL_CXXALIAS_SYS_CAST (getsockname, int, _GL_CXXALIASWARN (getsockname); # endif #elif @HAVE_WINSOCK2_H@ -# undef getsockname -# define getsockname getsockname_used_without_requesting_gnulib_module_getsockname +# if !GNULIB_GETSOCKNAME +# undef getsockname +# define getsockname getsockname_used_without_requesting_gnulib_module_getsockname +# endif #elif defined GNULIB_POSIXCHECK # undef getsockname # if HAVE_RAW_DECL_GETSOCKNAME diff --git a/modules/getsockname b/modules/getsockname index 8a44ebaebd..7e0e1a2dc7 100644 --- a/modules/getsockname +++ b/modules/getsockname @@ -18,6 +18,7 @@ AC_REQUIRE([gl_SYS_SOCKET_H]) gl_CONDITIONAL([GL_COND_OBJ_GETSOCKNAME], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([getsockname]) +gl_MODULE_INDICATOR([getsockname]) Makefile.am: if GL_COND_OBJ_GETSOCKNAME -- 2.39.5