diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-03-14 16:14:59 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-03-17 21:08:50 -0500 |
| commit | 575608b2021227f51beaf286cf71a27f4616cdcf (patch) | |
| tree | c67bf6a13e1e1e5bf33e9ce4fd4b089f74261554 /newlib | |
| parent | 6ba26630e01b7ae8bcaf1d258dc7e70a87da4fcf (diff) | |
| download | cygnal-575608b2021227f51beaf286cf71a27f4616cdcf.tar.gz cygnal-575608b2021227f51beaf286cf71a27f4616cdcf.tar.bz2 cygnal-575608b2021227f51beaf286cf71a27f4616cdcf.zip | |
Feature test macros overhaul: ctype.h
Simplify C99 test for isblank. isascii and toascii are BSD|SVID|XSI.
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/libc/include/ctype.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h index 56ad5abb6..58a123864 100644 --- a/newlib/libc/include/ctype.h +++ b/newlib/libc/include/ctype.h @@ -2,6 +2,7 @@ #define _CTYPE_H_ #include "_ansi.h" +#include <sys/cdefs.h> _BEGIN_STD_C @@ -19,11 +20,11 @@ int _EXFUN(isxdigit,(int __c)); int _EXFUN(tolower, (int __c)); int _EXFUN(toupper, (int __c)); -#if !defined(__STRICT_ANSI__) || defined(__cplusplus) || __STDC_VERSION__ >= 199901L +#if __ISO_C_VISIBLE >= 1999 int _EXFUN(isblank, (int __c)); #endif -#ifndef __STRICT_ANSI__ +#if __MISC_VISIBLE || __XSI_VISIBLE int _EXFUN(isascii, (int __c)); int _EXFUN(toascii, (int __c)); #define _tolower(__c) ((unsigned char)(__c) - 'A' + 'a') @@ -68,8 +69,7 @@ extern __IMPORT char *__ctype_ptr__; #define isgraph(__c) (__ctype_lookup(__c)&(_P|_U|_L|_N)) #define iscntrl(__c) (__ctype_lookup(__c)&_C) -#if defined(__GNUC__) && \ - (!defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901L) +#if defined(__GNUC__) && __ISO_C_VISIBLE >= 1999 #define isblank(__c) \ __extension__ ({ __typeof__ (__c) __x = (__c); \ (__ctype_lookup(__x)&_B) || (int) (__x) == '\t';}) @@ -98,13 +98,14 @@ extern __IMPORT char *__ctype_ptr__; (void) __ctype_ptr__[__x]; (tolower) (__x);}) # endif /* _MB_EXTENDED_CHARSETS* */ # endif /* __GNUC__ */ -#endif /* !__cplusplus */ -#ifndef __STRICT_ANSI__ +#if __MISC_VISIBLE || __XSI_VISIBLE #define isascii(__c) ((unsigned)(__c)<=0177) #define toascii(__c) ((__c)&0177) #endif +#endif /* !__cplusplus */ + /* For C++ backward-compatibility only. */ extern __IMPORT _CONST char _ctype_[]; |