diff options
| author | Elliott Hughes <enh@google.com> | 2016-06-09 14:58:20 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2016-06-23 22:22:36 +0000 |
| commit | 20e0898b967bbfea25708900797d7800707f63f8 (patch) | |
| tree | e3a581c700e1ae59834f00278a77d5edd5e6ab25 | |
| parent | ec3da0ede1860b30f9c405fe55b8729a0fff2f2b (diff) | |
| download | avahi-20e0898b967bbfea25708900797d7800707f63f8.tar.gz | |
Move the hacked-up glob.h off bionic internals.android-n-preview-5android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-n-iot-preview-2android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-iot-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-mr2-preview-1n-mr1-preview-1n-iot-preview-4n-iot-preview-2
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
(cherry picked from commit cff8f53637a857a54c099bd63ad12d49b9a4d1e2)
BUG: 29571769
| -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. */ |