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 /ctype | |
| parent | d668061994a7486a3ba9c7d5e7882d85a2883707 (diff) | |
| download | glibc-ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be.tar glibc-ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be.tar.gz glibc-ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be.tar.bz2 glibc-ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be.zip | |
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 'ctype')
| -rw-r--r-- | ctype/ctype.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ctype/ctype.h b/ctype/ctype.h index e5a45923db..a493b9281b 100644 --- a/ctype/ctype.h +++ b/ctype/ctype.h @@ -143,7 +143,7 @@ __END_NAMESPACE_C99 extern int isctype (int __c, int __mask) __THROW; #endif -#if defined __USE_MISC || defined __USE_MISC || defined __USE_XOPEN +#if defined __USE_MISC || defined __USE_XOPEN /* Return nonzero iff C is in the ASCII set (i.e., is no more than 7 bits wide). */ @@ -229,7 +229,7 @@ __NTH (toupper (int __c)) # define toupper(c) __tobody (c, toupper, *__ctype_toupper_loc (), (c)) # endif /* Optimizing gcc */ -# if defined __USE_MISC || defined __USE_MISC || defined __USE_XOPEN +# if defined __USE_MISC || defined __USE_XOPEN # define isascii(c) __isascii (c) # define toascii(c) __toascii (c) @@ -316,7 +316,7 @@ extern int toupper_l (int __c, __locale_t __l) __THROW; # define __isblank_l(c,l) __isctype_l((c), _ISblank, (l)) -# if defined __USE_MISC || defined __USE_MISC +# ifdef __USE_MISC # define __isascii_l(c,l) ((l), __isascii (c)) # define __toascii_l(c,l) ((l), __toascii (c)) # endif @@ -335,7 +335,7 @@ extern int toupper_l (int __c, __locale_t __l) __THROW; # define isblank_l(c,l) __isblank_l ((c), (l)) -# if defined __USE_MISC || defined __USE_MISC +# ifdef __USE_MISC # define isascii_l(c,l) __isascii_l ((c), (l)) # define toascii_l(c,l) __toascii_l ((c), (l)) # endif |