From 4b5d410591ed29afba010cd30594d8ed7c195c2e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 8 Mar 2025 16:29:53 -0800 Subject: [PATCH] dix-config.h: define HAVE_STRUCT_SOCKADDR_STORAGE for xtrans 1.6 xtrans 1.6 will use struct sockaddr_storage if HAVE_STRUCT_SOCKADDR_STORAGE is defined, even if IPv6 is disabled, unlike previous versions which tied it to the IPv6 #define. Signed-off-by: Alan Coopersmith Part-of: --- include/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/meson.build b/include/meson.build index c9c137634..994b4cfba 100644 --- a/include/meson.build +++ b/include/meson.build @@ -175,6 +175,8 @@ conf_data.set('HAVE_STRLCAT', cc.has_function('strlcat', dependencies: libbsd_de conf_data.set('HAVE_STRLCPY', cc.has_function('strlcpy', dependencies: libbsd_dep) ? '1' : false) conf_data.set('HAVE_STRNCASECMP', cc.has_function('strncasecmp') ? '1' : false) conf_data.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup') ? '1' : false) +# HAVE_STRUCT_SOCKADDR_STORAGE is used by xtrans >= 1.6 +conf_data.set('HAVE_STRUCT_SOCKADDR_STORAGE', cc.has_type('struct sockaddr_storage', prefix: '#include ') ? '1' : false) conf_data.set('HAVE_TIMINGSAFE_MEMCMP', cc.has_function('timingsafe_memcmp') ? '1' : false) conf_data.set('HAVE_VASPRINTF', cc.has_function('vasprintf') ? '1' : false) conf_data.set('HAVE_VSNPRINTF', cc.has_function('vsnprintf') ? '1' : false)