aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-06-09 23:21:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-09 23:21:03 +0000
commit0c927d55df668fd95cfef4aabcd44a03d68d6848 (patch)
treeed560d74e56c714ff50a858cd077d351bfeb1bfc
parenta07d9ad87a5066697197e49a6d7fa972c719252a (diff)
parent255fb41bae080a6805835ae4e38a9375085be379 (diff)
downloadavahi-0c927d55df668fd95cfef4aabcd44a03d68d6848.tar.gz
Move the hacked-up glob.h off bionic internals. am: cff8f53637 am: 38ea9e7e40
am: 255fb41bae Change-Id: I1c36666cfce9eaa229e545d106cbafd025fd92e7
-rw-r--r--avahi-daemon/glob.h4
1 files changed, 2 insertions, 2 deletions
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 @@ typedef struct {
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 @@ typedef struct {
#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. */