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.
This commit is contained in:
Bruno Haible
2024-07-25 01:23:52 +02:00
parent 82b8cf8d88
commit aefd8802e6
3 changed files with 11 additions and 2 deletions
+6
View File
@@ -1,5 +1,11 @@
2024-07-24 Bruno Haible <bruno@clisp.org>
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
+4 -2
View File
@@ -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
+1
View File
@@ -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