[glib] gsocket: Fix build error on Android
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsocket: Fix build error on Android
- Date: Fri, 20 Apr 2018 20:10:27 +0000 (UTC)
commit 994dd17ee52d59b249a0746ee289b3f35acf3f8a
Author: Xavier Claessens <xavier claessens collabora com>
Date: Fri Apr 20 12:08:19 2018 -0400
gsocket: Fix build error on Android
imr_interface.s_addr is not defined in the HAVE_IP_MREQN case.
https://bugzilla.gnome.org/show_bug.cgi?id=740791
gio/gsocket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 06042d8a8..3e811f984 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2379,7 +2379,7 @@ g_socket_multicast_group_operation_ssm (GSocket *socket,
case G_SOCKET_FAMILY_IPV4:
{
-#ifdef IP_ADD_SOURCE_MEMBERSHIP
+#if defined (IP_ADD_SOURCE_MEMBERSHIP) && !defined(HAVE_IP_MREQN)
gint optname;
struct ip_mreq_source mc_req_src;
@@ -2462,7 +2462,7 @@ g_socket_multicast_group_operation_ssm (GSocket *socket,
_("Error leaving multicast group: %s"),
_("No support for IPv4 source-specific multicast"));
return FALSE;
-#endif /* IP_ADD_SOURCE_MEMBERSHIP */
+#endif /* IP_ADD_SOURCE_MEMBERSHIP && !HAVE_IP_MREQN*/
}
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]