mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
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.
This commit is contained in:
@ -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. */
|
||||
|
||||
|
Reference in New Issue
Block a user