diff options
| -rwxr-xr-x | arch/arm/bits/alltypes.h.sh | 4 | ||||
| -rwxr-xr-x | arch/i386/bits/alltypes.h.sh | 4 | ||||
| -rwxr-xr-x | arch/microblaze/bits/alltypes.h.sh | 4 | ||||
| -rwxr-xr-x | arch/mips/bits/alltypes.h.sh | 4 | ||||
| -rwxr-xr-x | arch/powerpc/bits/alltypes.h.sh | 4 | ||||
| -rwxr-xr-x | arch/x86_64/bits/alltypes.h.sh | 4 | ||||
| -rw-r--r-- | src/ctype/wctrans.c | 8 |
7 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/bits/alltypes.h.sh b/arch/arm/bits/alltypes.h.sh index 274de0df..a531ee0f 100755 --- a/arch/arm/bits/alltypes.h.sh +++ b/arch/arm/bits/alltypes.h.sh @@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list; TYPEDEF unsigned wchar_t; #endif TYPEDEF int wint_t; -TYPEDEF long wctrans_t; -TYPEDEF long wctype_t; +TYPEDEF const int * wctrans_t; +TYPEDEF unsigned long wctype_t; TYPEDEF signed char int8_t; TYPEDEF short int16_t; diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh index 10fcf6a3..13def835 100755 --- a/arch/i386/bits/alltypes.h.sh +++ b/arch/i386/bits/alltypes.h.sh @@ -34,8 +34,8 @@ TYPEDEF long wchar_t; #endif #endif TYPEDEF long wint_t; -TYPEDEF long wctrans_t; -TYPEDEF long wctype_t; +TYPEDEF const int * wctrans_t; +TYPEDEF unsigned long wctype_t; TYPEDEF signed char int8_t; TYPEDEF short int16_t; diff --git a/arch/microblaze/bits/alltypes.h.sh b/arch/microblaze/bits/alltypes.h.sh index c909bc37..2397c6cd 100755 --- a/arch/microblaze/bits/alltypes.h.sh +++ b/arch/microblaze/bits/alltypes.h.sh @@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list; TYPEDEF int wchar_t; #endif TYPEDEF int wint_t; -TYPEDEF long wctrans_t; -TYPEDEF long wctype_t; +TYPEDEF const int * wctrans_t; +TYPEDEF unsigned long wctype_t; TYPEDEF signed char int8_t; TYPEDEF short int16_t; diff --git a/arch/mips/bits/alltypes.h.sh b/arch/mips/bits/alltypes.h.sh index c909bc37..2397c6cd 100755 --- a/arch/mips/bits/alltypes.h.sh +++ b/arch/mips/bits/alltypes.h.sh @@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list; TYPEDEF int wchar_t; #endif TYPEDEF int wint_t; -TYPEDEF long wctrans_t; -TYPEDEF long wctype_t; +TYPEDEF const int * wctrans_t; +TYPEDEF unsigned long wctype_t; TYPEDEF signed char int8_t; TYPEDEF short int16_t; diff --git a/arch/powerpc/bits/alltypes.h.sh b/arch/powerpc/bits/alltypes.h.sh index befad081..f3dac12a 100755 --- a/arch/powerpc/bits/alltypes.h.sh +++ b/arch/powerpc/bits/alltypes.h.sh @@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list; TYPEDEF long wchar_t; #endif TYPEDEF int wint_t; -TYPEDEF long wctrans_t; -TYPEDEF long wctype_t; +TYPEDEF const int * wctrans_t; +TYPEDEF unsigned long wctype_t; TYPEDEF signed char int8_t; TYPEDEF short int16_t; diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh index 083ea230..bc9a3cc0 100755 --- a/arch/x86_64/bits/alltypes.h.sh +++ b/arch/x86_64/bits/alltypes.h.sh @@ -25,8 +25,8 @@ TYPEDEF __builtin_va_list va_list; TYPEDEF int wchar_t; #endif TYPEDEF int wint_t; -TYPEDEF int wctrans_t; -TYPEDEF int wctype_t; +TYPEDEF const int * wctrans_t; +TYPEDEF unsigned long wctype_t; TYPEDEF signed char int8_t; TYPEDEF short int16_t; diff --git a/src/ctype/wctrans.c b/src/ctype/wctrans.c index 03e9fd6a..739869d0 100644 --- a/src/ctype/wctrans.c +++ b/src/ctype/wctrans.c @@ -3,14 +3,14 @@ wctrans_t wctrans(const char *class) { - if (!strcmp(class, "toupper")) return 1; - if (!strcmp(class, "tolower")) return 2; + if (!strcmp(class, "toupper")) return (wctrans_t)1; + if (!strcmp(class, "tolower")) return (wctrans_t)2; return 0; } wint_t towctrans(wint_t wc, wctrans_t trans) { - if (trans == 1) return towupper(wc); - if (trans == 2) return towlower(wc); + if (trans == (wctrans_t)1) return towupper(wc); + if (trans == (wctrans_t)2) return towlower(wc); return wc; } |