Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../glib-2.42.1/gio/gthreadedresolver.c ./gio/gthreadedresolver.c |
2 | --- ../glib-2.42.1/gio/gthreadedresolver.c 2014-07-31 09:36:53.000000000 -0400 | |
3 | +++ ./gio/gthreadedresolver.c 2014-12-21 14:20:34.755658537 -0500 | |
4 | @@ -263,7 +263,7 @@ | |
5 | ||
6 | #if defined(G_OS_UNIX) | |
7 | ||
8 | -#ifdef __BIONIC__ | |
9 | +#if defined __BIONIC__ && __ANDROID_API__ < 21 | |
10 | /* Copy from bionic/libc/private/arpa_nameser_compat.h | |
11 | * and bionic/libc/private/arpa_nameser.h */ | |
12 | typedef struct { |