4 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/bits/alltypes.h.sh b/arch/arm/bits/alltypes.h.sh
index 6409a96e..11f1d93f 100755
--- a/arch/arm/bits/alltypes.h.sh
+++ b/arch/arm/bits/alltypes.h.sh
@@ -22,12 +22,8 @@ TYPEDEF long ptrdiff_t;
 
 TYPEDEF __builtin_va_list va_list;
 
-#ifdef __WCHAR_TYPE__
-TYPEDEF __WCHAR_TYPE__ wchar_t;
-#else
-TYPEDEF long wchar_t;
-#endif
-TYPEDEF long wint_t;
+TYPEDEF unsigned wchar_t;
+TYPEDEF int wint_t;
 TYPEDEF long wctrans_t;
 TYPEDEF long wctype_t;
 
diff --git a/arch/arm/bits/wchar.h b/arch/arm/bits/wchar.h
new file mode 100644
index 00000000..ffb26917
--- /dev/null
+++ b/arch/arm/bits/wchar.h
@@ -0,0 +1,4 @@
+#ifndef WCHAR_MIN
+#define WCHAR_MIN 0U
+#define WCHAR_MAX 0xffffffffU
+#endif
diff --git a/arch/i386/bits/wchar.h b/arch/i386/bits/wchar.h
new file mode 100644
index 00000000..c969c5b6
--- /dev/null
+++ b/arch/i386/bits/wchar.h
@@ -0,0 +1,4 @@
+#ifndef WCHAR_MIN
+#define WCHAR_MIN (-1-0x7fffffff)
+#define WCHAR_MAX (0x7fffffff)
+#endif
diff --git a/arch/x86_64/bits/wchar.h b/arch/x86_64/bits/wchar.h
new file mode 100644
index 00000000..c969c5b6
--- /dev/null
+++ b/arch/x86_64/bits/wchar.h
@@ -0,0 +1,4 @@
+#ifndef WCHAR_MIN
+#define WCHAR_MIN (-1-0x7fffffff)
+#define WCHAR_MAX (0x7fffffff)
+#endif