diff options
Diffstat (limited to 'wctype')
| -rw-r--r-- | wctype/wctype.c | 8 | ||||
| -rw-r--r-- | wctype/wctype.h | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/wctype/wctype.c b/wctype/wctype.c index 0f7e478d64..c3bb1d9c6a 100644 --- a/wctype/wctype.c +++ b/wctype/wctype.c @@ -45,12 +45,6 @@ wctype (const char *property) # define SWAPU32(w) \ (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24)) -# define SWAPU16(w) \ - (((w) >> 8) | ((w) << 8)) - - if (sizeof (wctype_t) == 4) - return SWAPU32 (result); - else - return SWAPU16 (result); + return SWAPU32 (result); #endif } diff --git a/wctype/wctype.h b/wctype/wctype.h index 7e90e2bad5..cabbc67b24 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -38,8 +38,12 @@ __BEGIN_DECLS hold any value corresponding to members of the extended character set, as well as at least one value that does not correspond to any member of the extended character set. */ +#ifndef __have_wint_t_defined +#define __have_wint_t_defined 1 +/* This is a hack!!! */ typedef unsigned int wint_t; #endif +#endif /* Scalar type that can hold values which represent locale-specific character mappings. */ @@ -47,13 +51,7 @@ typedef const unsigned int *wctrans_t; /* Scalar type that can hold values which represent locale-specific character classifications. */ -#if 0 typedef unsigned long int wctype_t; -#else -/* For compatibility reasons we have to use shorts for now. */ -typedef unsigned short int wctype_t; -#endif - /* Constant expression of type `wint_t' whose value does not correspond to any member of the extended character set. */ |