Merge branch 'hurd-socket-multicast-fix' into 'main'

gsocket: Fix #ifdef for defining g_socket_get_adapter_ipv4_addr()

See merge request GNOME/glib!4340
This commit is contained in:
Philip Withnall 2024-10-15 19:00:06 +00:00
commit 984224263d

View File

@ -2402,7 +2402,7 @@ g_socket_w32_get_adapter_ipv4_addr (const gchar *name_or_ip)
return ip_result;
}
#elif defined(HAVE_SIOCGIFADDR)
#elif (defined(HAVE_SIOCGIFADDR) && (!(defined(HAVE_IP_MREQN) && !defined(__APPLE__)) || defined(IP_ADD_SOURCE_MEMBERSHIP)))
static gulong
g_socket_get_adapter_ipv4_addr (GSocket *socket,
const char *iface,