From ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 13 Feb 2014 22:07:25 +0000 Subject: 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. --- libio/stdio.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libio/stdio.h') diff --git a/libio/stdio.h b/libio/stdio.h index b70e1079d5..90a253f209 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -604,7 +604,7 @@ extern int putchar_unlocked (int __c); #endif /* Use POSIX or MISC. */ -#if defined __USE_MISC || defined __USE_MISC \ +#if defined __USE_MISC \ || (defined __USE_XOPEN && !defined __USE_XOPEN2K) /* Get a word (int) from STREAM. */ extern int getw (FILE *__stream); @@ -864,8 +864,7 @@ extern int fileno_unlocked (FILE *__stream) __THROW __wur; #endif -#if (defined __USE_POSIX2 || defined __USE_MISC || defined __USE_MISC || \ - defined __USE_MISC) +#if defined __USE_POSIX2 || defined __USE_MISC /* Create a new stream connected to a pipe running the given command. This function is a possible cancellation point and therefore not -- cgit 1.4.1