Merge branch 'wip/jehan/android-master-v3' into 'master'

Wip/jehan/android master v3

See merge request GNOME/glib!93

gio/glocalfileinfo.c

@@ -1123,7 +1123,9 @@ lookup_uid_data (uid_t uid)
   char buffer[4096];
   struct passwd pwbuf;
   struct passwd *pwbufp;
+#ifndef __BIONIC__
   char *gecos, *comma;
+#endif
 
   if (uid_cache == NULL)
     uid_cache = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify)uid_data_free);
@@ -1209,8 +1211,10 @@ static char *
 lookup_gid_name (gid_t gid)
 {
   char *name;
+#if defined (HAVE_GETGRGID_R)
   char buffer[4096];
   struct group gbuf;
+#endif
   struct group *gbufp;
 
   if (gid_cache == NULL)

gio/gthreadedresolver.c

@@ -803,7 +803,9 @@ free_records (GList *records)
 
 #if defined(G_OS_UNIX)
 #ifdef __BIONIC__
+#ifndef C_IN
 #define C_IN 1
+#endif
 int res_query(const char *, int, int, u_char *, int);
 #endif
 #endif

gio/gunixsocketaddress.c

@@ -66,7 +66,9 @@ enum
   PROP_ADDRESS_TYPE
 };
 
+#ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX sizeof (((struct sockaddr_un *) 0)->sun_path)
+#endif
 
 struct _GUnixSocketAddressPrivate
 {