13 lines
456 B
Diff
13 lines
456 B
Diff
diff -u -r ../glib-2.42.1/gio/gthreadedresolver.c ./gio/gthreadedresolver.c
|
|
--- ../glib-2.42.1/gio/gthreadedresolver.c 2014-07-31 09:36:53.000000000 -0400
|
|
+++ ./gio/gthreadedresolver.c 2014-12-21 14:20:34.755658537 -0500
|
|
@@ -263,7 +263,7 @@
|
|
|
|
#if defined(G_OS_UNIX)
|
|
|
|
-#ifdef __BIONIC__
|
|
+#if defined __BIONIC__ && __ANDROID_API__ < 21
|
|
/* Copy from bionic/libc/private/arpa_nameser_compat.h
|
|
* and bionic/libc/private/arpa_nameser.h */
|
|
typedef struct {
|