diff options
Diffstat (limited to 'ctype')
| -rw-r--r-- | ctype/ctype-info.c | 10 | ||||
| -rw-r--r-- | ctype/ctype.h | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/ctype/ctype-info.c b/ctype/ctype-info.c index a7688f7d00..30b1cce6ff 100644 --- a/ctype/ctype-info.c +++ b/ctype/ctype-info.c @@ -17,7 +17,7 @@ Boston, MA 02111-1307, USA. */ #include <ctype.h> -#include "../locale/localeinfo.h" +#include <locale/localeinfo.h> /* Defined in locale/C-ctype.c. */ extern const char _nl_C_LC_CTYPE_class[]; @@ -30,8 +30,8 @@ extern const char _nl_C_LC_CTYPE_width[]; #define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o); const unsigned short int *__ctype_b = b (unsigned short int, class, 128); -const unsigned int *__ctype32_b = b (unsigned int, class32, 0); -const int *__ctype_tolower = b (int, tolower, 128); -const int *__ctype_toupper = b (int, toupper, 128); -const unsigned int *__ctype_names = b (unsigned int, names, 0); +const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0); +const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128); +const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128); +const __uint32_t *__ctype_names = b (__uint32_t, names, 0); const unsigned char *__ctype_width = b (unsigned char, width, 0); diff --git a/ctype/ctype.h b/ctype/ctype.h index bd128445bc..22b17c1ed7 100644 --- a/ctype/ctype.h +++ b/ctype/ctype.h @@ -21,9 +21,10 @@ */ #ifndef _CTYPE_H - #define _CTYPE_H 1 + #include <features.h> +#include <gnu/types.h> __BEGIN_DECLS @@ -72,8 +73,8 @@ enum doesn't fit into an `unsigned char'. But today more important is that the arrays are also used for multi-byte character sets. */ extern __const unsigned short int *__ctype_b; /* Characteristics. */ -extern __const int *__ctype_tolower; /* Case conversions. */ -extern __const int *__ctype_toupper; /* Case conversions. */ +extern __const __int32_t *__ctype_tolower; /* Case conversions. */ +extern __const __int32_t *__ctype_toupper; /* Case conversions. */ #define __isctype(c, type) \ (__ctype_b[(int) (c)] & (unsigned short int) type) |