diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-21 04:35:01 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-21 04:35:01 +0000 |
| commit | c44cf415dd8d932d47448f805320fdbe95effd2e (patch) | |
| tree | 8aa1358ea9b57cde138867be4f56afda2c6853d9 | |
| parent | a3e0fa0a9540506bf583f3c36f38d8260afe9c14 (diff) | |
| download | uClibc-alpine-c44cf415dd8d932d47448f805320fdbe95effd2e.tar.bz2 uClibc-alpine-c44cf415dd8d932d47448f805320fdbe95effd2e.tar.xz | |
Merge from trunk.
| -rw-r--r-- | include/glob.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/glob.h b/include/glob.h index a8b76523e..928b62e70 100644 --- a/include/glob.h +++ b/include/glob.h @@ -55,7 +55,7 @@ typedef __SIZE_TYPE__ size_t; #if ( !defined __USE_POSIX2 || defined __USE_BSD || defined __USE_GNU ) && defined __UCLIBC_HAS_GNU_GLOB__ # define GLOB_MAGCHAR (1 << 8)/* Set in gl_flags if any metachars seen. */ -#if 0 /* uClibc's gnu glob does not support these */ +#if 1 /* uClibc gnu glob does not support these */ # define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions. */ # define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */ # define GLOB_NOMAGIC (1 << 11)/* If no magic chars, return the pattern. */ @@ -101,6 +101,7 @@ typedef struct #ifdef __UCLIBC_HAS_GNU_GLOB__ int gl_flags; /* Set to FLAGS, maybe | GLOB_MAGCHAR. */ +#if 1 /* uClibc gnu glob does not support these */ /* If the GLOB_ALTDIRFUNC flag is set, the following functions are used instead of the normal file access functions. */ void (*gl_closedir) (void *); @@ -117,6 +118,7 @@ typedef struct int (*gl_lstat) (__const char *__restrict, void *__restrict); int (*gl_stat) (__const char *__restrict, void *__restrict); #endif +#endif #endif /* __UCLIBC_HAS_GNU_GLOB__ */ } glob_t; @@ -132,6 +134,7 @@ typedef struct #ifdef __UCLIBC_HAS_GNU_GLOB__ int gl_flags; +#if 1 /* uClibc gnu glob does not support these */ /* If the GLOB_ALTDIRFUNC flag is set, the following functions are used instead of the normal file access functions. */ void (*gl_closedir) (void *); @@ -148,6 +151,7 @@ typedef struct int (*gl_lstat) (__const char *__restrict, void *__restrict); int (*gl_stat) (__const char *__restrict, void *__restrict); # endif +#endif #endif /* __UCLIBC_HAS_GNU_GLOB__ */ } glob64_t; #endif |