diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/fnmatch.h | 6 | ||||
| -rw-r--r-- | posix/glob.h | 18 | ||||
| -rw-r--r-- | posix/wordexp.h | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/posix/fnmatch.h b/posix/fnmatch.h index 0966ee301a..eeaee7fb8c 100644 --- a/posix/fnmatch.h +++ b/posix/fnmatch.h @@ -24,8 +24,10 @@ extern "C" { #endif #if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32 -# undef __P -# define __P(protos) protos +# if !defined __GLIBC__ || !defined __P +# undef __P +# define __P(protos) protos +# endif #else /* Not C++ or ANSI C. */ # undef __P # define __P(protos) () diff --git a/posix/glob.h b/posix/glob.h index f4c0974011..55208e1799 100644 --- a/posix/glob.h +++ b/posix/glob.h @@ -24,15 +24,17 @@ extern "C" { #undef __ptr_t #if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32 -# undef __P -# undef __PMT -# define __P(protos) protos -# define __PMT(protos) protos -# define __ptr_t void * -# if !defined __GNUC__ || __GNUC__ < 2 -# undef __const -# define __const const +# if !defined __GLIBC__ || !defined __P +# undef __P +# undef __PMT +# define __P(protos) protos +# define __PMT(protos) protos +# if !defined __GNUC__ || __GNUC__ < 2 +# undef __const +# define __const const +# endif # endif +# define __ptr_t void * #else /* Not C++ or ANSI C. */ # undef __P # undef __PMT diff --git a/posix/wordexp.h b/posix/wordexp.h index 2bdce27f93..5a4102b760 100644 --- a/posix/wordexp.h +++ b/posix/wordexp.h @@ -33,7 +33,7 @@ enum WRDE_SHOWERR = (1 << 4), /* Don't redirect stderr to /dev/null. */ WRDE_UNDEF = (1 << 5), /* Error for expanding undefined variables. */ __WRDE_FLAGS = (WRDE_DOOFFS | WRDE_APPEND | WRDE_NOCMD | - WRDE_REUSE | WRDE_SHOWERR | WRDE_UNDEF), + WRDE_REUSE | WRDE_SHOWERR | WRDE_UNDEF) }; /* Structure describing a word-expansion run. */ |