From 0abcaa18e3b32048f22e5a2b213021be1abf5adf Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 12 Oct 2015 23:29:00 -0400
Subject: [PATCH] gthreadedresolver.c: Fix for Android 5.0+

https://bugzilla.gnome.org/show_bug.cgi?id=756477
---
 gio/gthreadedresolver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
index c02c593c2..2ba42f172 100644
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -263,7 +263,7 @@ lookup_by_address_finish (GResolver     *resolver,
 
 #if defined(G_OS_UNIX)
 
-#ifdef __BIONIC__
+#if defined __BIONIC__ && !defined BIND_4_COMPAT
 /* Copy from bionic/libc/private/arpa_nameser_compat.h
  * and bionic/libc/private/arpa_nameser.h */
 typedef struct {