Move the hacked-up glob.h off bionic internals.
am: 20e0898b96

Change-Id: I5f9c7f5e0abef86dc32265906611748ddf2cd331
diff --git a/avahi-daemon/glob.h b/avahi-daemon/glob.h
index 6f5fd20..93f6f8e 100644
--- a/avahi-daemon/glob.h
+++ b/avahi-daemon/glob.h
@@ -76,7 +76,7 @@
 	int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
-#if __POSIX_VISIBLE >= 199209
+#if defined(__BIONIC__) || __POSIX_VISIBLE >= 199209
 /* Believed to have been introduced in 1003.2-1992 */
 #define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
 #define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
@@ -93,7 +93,7 @@
 #define	GLOB_NOSYS	(-4)	/* Obsolete: source comptability only. */
 #endif /* __POSIX_VISIBLE >= 199209 */
 
-#if __BSD_VISIBLE
+#if defined(__BIONIC__) || __BSD_VISIBLE
 #define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */