diff options
| -rw-r--r-- | include/ctype.h | 32 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_ctype.h | 15 |
2 files changed, 12 insertions, 35 deletions
diff --git a/include/ctype.h b/include/ctype.h index e45280f73..d7bce2e87 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -31,40 +31,32 @@ __BEGIN_DECLS -#ifndef _ISbit /* These are all the characteristics of characters. If there get to be more than 16 distinct characteristics, __ctype_mask_t will need to be adjusted. */ -# define _ISbit(bit) (1 << (bit)) - enum { - _ISupper = _ISbit (0), /* UPPERCASE. */ - _ISlower = _ISbit (1), /* lowercase. */ - _ISalpha = _ISbit (2), /* Alphabetic. */ - _ISdigit = _ISbit (3), /* Numeric. */ - _ISxdigit = _ISbit (4), /* Hexadecimal numeric. */ - _ISspace = _ISbit (5), /* Whitespace. */ - _ISprint = _ISbit (6), /* Printing. */ - _ISgraph = _ISbit (7), /* Graphical. */ - _ISblank = _ISbit (8), /* Blank (usually SPC and TAB). */ - _IScntrl = _ISbit (9), /* Control character. */ - _ISpunct = _ISbit (10), /* Punctuation. */ - _ISalnum = _ISbit (11) /* Alphanumeric. */ + _ISupper = 1 << 0, /* UPPERCASE. */ + _ISlower = 1 << 1, /* lowercase. */ + _ISalpha = 1 << 2, /* Alphabetic. */ + _ISdigit = 1 << 3, /* Numeric. */ + _ISxdigit = 1 << 4, /* Hexadecimal numeric. */ + _ISspace = 1 << 5, /* Whitespace. */ + _ISprint = 1 << 6, /* Printing. */ + _ISgraph = 1 << 7, /* Graphical. */ + _ISblank = 1 << 8, /* Blank (usually SPC and TAB). */ + _IScntrl = 1 << 9, /* Control character. */ + _ISpunct = 1 << 10, /* Punctuation. */ + _ISalnum = 1 << 11, /* Alphanumeric. */ }; -#else -#error _ISbit already defined! -#endif /* ! _ISbit */ #include <bits/uClibc_touplow.h> #ifdef __UCLIBC_HAS_CTYPE_SIGNED__ # define __UCLIBC_CTYPE_IN_TO_DOMAIN(c) (((unsigned int)((c) + 128)) < 384) - #else /* __UCLIBC_HAS_CTYPE_SIGNED__ */ # define __UCLIBC_CTYPE_IN_TO_DOMAIN(c) (((unsigned int)(c)) < 256) - #endif /* __UCLIBC_HAS_CTYPE_SIGNED__ */ /* In the thread-specific locale model (see `uselocale' in <locale.h>) diff --git a/libc/sysdeps/linux/common/bits/uClibc_ctype.h b/libc/sysdeps/linux/common/bits/uClibc_ctype.h index 0b02c5dbf..76c658afa 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_ctype.h +++ b/libc/sysdeps/linux/common/bits/uClibc_ctype.h @@ -189,21 +189,6 @@ __END_DECLS /**********************************************************************/ #ifdef __GNUC__ -#define __isbody_C_macro(f,args) __C_ ## f args - -#define __isbody(f,c) \ - (__extension__ ({ \ - int __res; \ - if (sizeof(c) > sizeof(char)) { \ - int __c = (c); \ - __res = __isbody_C_macro(f,(__c)); \ - } else { \ - unsigned char __c = (c); \ - __res = __isbody_C_macro(f,(__c)); \ - } \ - __res; \ - })) - #define __body_C_macro(f,args) __C_ ## f args #define __body(f,c) \ |