ce426f
Backport of commit 052aff95782fefe9c63566471063e8b20836bfb8
ce426f
Author: Joseph Myers <joseph@codesourcery.com>
ce426f
Date:   Wed Jan 23 00:42:51 2013 +0000
ce426f
ce426f
    Make bits/wchar.h correct for all architectures (bug 15036).
ce426f
ce426f
2013-01-23  Joseph Myers  <joseph@codesourcery.com>
ce426f
ce426f
	[BZ #15036]
ce426f
	* bits/wchar.h (__WCHAR_MAX): Define based on __WCHAR_MAX__, or
ce426f
	based on [L'\0' - 1 > 0] if [!__WCHAR_MAX__].
ce426f
	(__WCHAR_MIN): Likewise, using __WCHAR_MIN__.
ce426f
	* sysdeps/unix/sysv/linux/x86/bits/wchar.h: Remove.
ce426f
ce426f
ce426f
ce426f
diff -ruNp glibc-2.17-c758a686/bits/wchar.h glibc-2.17-c758a686/bits/wchar.h
ce426f
--- glibc-2.17-c758a686/bits/wchar.h	2012-12-24 22:02:13.000000000 -0500
ce426f
+++ glibc-2.17-c758a686/bits/wchar.h	2014-03-27 14:53:45.940914030 -0400
ce426f
@@ -19,7 +19,31 @@
ce426f
 #ifndef _BITS_WCHAR_H
ce426f
 #define _BITS_WCHAR_H	1
ce426f
 
ce426f
-#define __WCHAR_MIN	(-2147483647 - 1)
ce426f
-#define __WCHAR_MAX	(2147483647)
ce426f
+/* The fallback definitions, for when __WCHAR_MAX__ or __WCHAR_MIN__
ce426f
+   are not defined, give the right value and type as long as both int
ce426f
+   and wchar_t are 32-bit types.  Adding L'\0' to a constant value
ce426f
+   ensures that the type is correct; it is necessary to use (L'\0' +
ce426f
+   0) rather than just L'\0' so that the type in C++ is the promoted
ce426f
+   version of wchar_t rather than the distinct wchar_t type itself.
ce426f
+   Because wchar_t in preprocessor #if expressions is treated as
ce426f
+   intmax_t or uintmax_t, the expression (L'\0' - 1) would have the
ce426f
+   wrong value for WCHAR_MAX in such expressions and so cannot be used
ce426f
+   to define __WCHAR_MAX in the unsigned case.  */
ce426f
+
ce426f
+#ifdef __WCHAR_MAX__
ce426f
+# define __WCHAR_MAX	__WCHAR_MAX__
ce426f
+#elif L'\0' - 1 > 0
ce426f
+# define __WCHAR_MAX	(0xffffffffu + L'\0')
ce426f
+#else
ce426f
+# define __WCHAR_MAX	(0x7fffffff + L'\0')
ce426f
+#endif
ce426f
+
ce426f
+#ifdef __WCHAR_MIN__
ce426f
+# define __WCHAR_MIN	__WCHAR_MIN__
ce426f
+#elif L'\0' - 1 > 0
ce426f
+# define __WCHAR_MIN	(L'\0' + 0)
ce426f
+#else
ce426f
+# define __WCHAR_MIN	(-__WCHAR_MAX - 1)
ce426f
+#endif
ce426f
 
ce426f
 #endif	/* bits/wchar.h */