luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-22 00:48:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gsocket: Fix build error on Android"

Browse Source 
This was the wrong fix, the real cause is a bug in Android NDK r16:
https://issuetracker.google.com/issues/36987220

This reverts commit 994dd17ee5.
This commit is contained in:
Xavier Claessens
2018-04-20 16:37:28 -04:00
parent 994dd17ee5
commit 51e5324493
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gsocket.c
View File

@@ -2379,7 +2379,7 @@ g_socket_multicast_group_operation_ssm (GSocket *socket,
case G_SOCKET_FAMILY_IPV4: case G_SOCKET_FAMILY_IPV4:
{ {
#if defined (IP_ADD_SOURCE_MEMBERSHIP) && !defined(HAVE_IP_MREQN) #ifdef IP_ADD_SOURCE_MEMBERSHIP
gint optname; gint optname;
struct ip_mreq_source mc_req_src; struct ip_mreq_source mc_req_src;
@@ -2462,7 +2462,7 @@ g_socket_multicast_group_operation_ssm (GSocket *socket,
_("Error leaving multicast group: %s"), _("Error leaving multicast group: %s"),
_("No support for IPv4 source-specific multicast")); _("No support for IPv4 source-specific multicast"));
return FALSE; return FALSE;
#endif /* IP_ADD_SOURCE_MEMBERSHIP && !HAVE_IP_MREQN*/ #endif /* IP_ADD_SOURCE_MEMBERSHIP */
} }
break; break;