lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Clean up trivially redundant __USE_MISC conditionals.

Browse Source 
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:
Joseph Myers
2014-02-13 22:07:25 +00:00
parent d668061994
commit ed9a38e21b
14 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libio/stdio.h
View File

@ -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