diff options
| author | Elliott Hughes <enh@google.com> | 2016-06-09 14:58:20 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-06-09 14:58:20 -0700 |
| commit | cff8f53637a857a54c099bd63ad12d49b9a4d1e2 (patch) | |
| tree | ed560d74e56c714ff50a858cd077d351bfeb1bfc | |
| parent | a07d9ad87a5066697197e49a6d7fa972c719252a (diff) | |
| download | avahi-cff8f53637a857a54c099bd63ad12d49b9a4d1e2.tar.gz | |
Move the hacked-up glob.h off bionic internals.
This file isn't upstream (in avahi, that is; obviously it's in FreeBSD),
and can just be removed when we add <glob.h> to bionic. For now, since
avahi actually wants all the functionality, just turn everything on.
Change-Id: I878c61312e955f6813359f93b3d466d317f09968
| -rw-r--r-- | avahi-daemon/glob.h | 4 |
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. */ |