diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-02-13 22:07:25 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-02-13 22:07:53 +0000 |
| commit | ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be (patch) | |
| tree | e530a67485edf3070f12552c45f8d07462e0f264 /stdlib | |
| parent | d668061994a7486a3ba9c7d5e7882d85a2883707 (diff) | |
| download | glibc-ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be.tar.gz | |
Clean up trivially redundant __USE_MISC conditionals.
This patch cleans up cases of __USE_MISC that are trivially redundant
after the recent substitution of __USE_MISC for __USE_BSD and
__USE_SVID: either in constructs such as "defined __USE_MISC ||
defined __USE_MISC", or else (in the bits/mman.h case) a conditional
on __USE_MISC nested inside another __USE_MISC conditional. (The
cleanups remaining after this patch are still quite large, but it
seems a reasonable piece to separate out.)
Tested x86_64.
* bits/mman.h [__USE_MISC]: Remove redundant conditionals.
* ctype/ctype.h [__USE_MISC]: Likewise.
* dirent/dirent.h [__USE_MISC]: Likewise.
* grp/grp.h [__USE_MISC]: Likewise.
* io/fcntl.h [__USE_MISC]: Likewise.
* io/sys/stat.h [__USE_MISC]: Likewise.
* libio/stdio.h [__USE_MISC]: Likewise.
* posix/unistd.h [__USE_MISC]: Likewise.
* pwd/pwd.h [__USE_MISC]: Likewise.
* stdlib.h [__USE_MISC]: Likewise.
* string/bits/string2.h [__USE_MISC]: Likewise.
* string/string.h [__USE_MISC]: Likewise.
* time/time.h [__USE_MISC]: Likewise.
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/stdlib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 6f3449bbb5..20b79a71f5 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -310,7 +310,7 @@ extern long int a64l (const char *__s) #endif /* Use SVID || extended X/Open. */ -#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_MISC +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED # include <sys/types.h> /* we need int32_t... */ /* These are the functions that actually do things. The `random', `srandom', @@ -488,7 +488,7 @@ __END_NAMESPACE_STD extern void cfree (void *__ptr) __THROW; #endif /* Use misc. */ -#if defined __USE_GNU || defined __USE_MISC || defined __USE_MISC +#if defined __USE_GNU || defined __USE_MISC # include <alloca.h> #endif /* Use GNU, BSD, or misc. */ |