path: root/src
diff options
authorRich Felker <>2013-03-04 19:22:14 -0500
committerRich Felker <>2013-03-04 19:22:14 -0500
commitda1442c9a8c58f8ad85a1bd96007f60bc372d157 (patch)
tree91f94f4aca74c5b625723ba62ef488c0b9fa9982 /src
parent8c741783fc96d559cfe79301c924c217b2905c0c (diff)
fix types for wctype_t and wctrans_t
wctype_t was incorrectly "int" rather than "long" on x86_64. not only is this an ABI incompatibility; it's also a major design flaw if we ever wanted wctype_t to be implemented as a pointer, which would be necessary if locales support custom character classes, since int is too small to store a converted pointer. this commit fixes wctype_t to be unsigned long on all archs, matching the LSB ABI; this change does not matter for C code, but for C++ it affects mangling. the same issue applied to wctrans_t. glibc/LSB defines this type as const __int32_t *, but since no such definition is visible, I've just expanded the definition, int, everywhere. it would be nice if these types (which don't vary by arch) could be in wctype.h, but the OB XSI requirement in POSIX that wchar.h expose some types and functions from wctype.h precludes doing so. glibc works around this with some hideous hacks, but trying to duplicate that would go against the intent of musl's headers.
Diffstat (limited to 'src')
1 files changed, 4 insertions, 4 deletions
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;