[glib] Revert "gsocket: Fix build error on Android"

[Xavier Claessens <xclaesse src gnome org>]

commit 51e5324493096905dbea834442d032120f5ffee0
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Fri Apr 20 16:37:28 2018 -0400

    Revert "gsocket: Fix build error on Android"
    
    This was the wrong fix, the real cause is a bug in Android NDK r16:
    https://issuetracker.google.com/issues/36987220
    
    This reverts commit 994dd17ee52d59b249a0746ee289b3f35acf3f8a.

 gio/gsocket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 3e811f984..06042d8a8 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:
       {
-#if defined (IP_ADD_SOURCE_MEMBERSHIP) && !defined(HAVE_IP_MREQN)
+#ifdef IP_ADD_SOURCE_MEMBERSHIP
         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 && !HAVE_IP_MREQN*/
+#endif  /* IP_ADD_SOURCE_MEMBERSHIP */
       }
       break;