summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-05-16 18:49:01 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-05-16 18:49:30 +0000
commit4e124cedfb293c35b37f17c41b5444a2f42e4541 (patch)
tree2e72e40477905e4e7136380338755a837d3b230f
parent5762f7aeff67505c9f939f47ef7df18d813f4c04 (diff)
downloadglibc-4e124cedfb293c35b37f17c41b5444a2f42e4541.tar.gz
glibc-4e124cedfb293c35b37f17c41b5444a2f42e4541.tar.xz
glibc-4e124cedfb293c35b37f17c41b5444a2f42e4541.zip
Update __STDC_ISO_10646__.
-rw-r--r--ChangeLog4
-rw-r--r--include/stdc-predef.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 28ca2d1c5c..7d5b6c9cb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-16  Joseph Myers  <joseph@codesourcery.com>
+
+	* include/stdc-predef.h (__STDC_ISO_10646__): Increase to 201103L.
+
 2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/bits/shm.h (shmatt_t): Use
diff --git a/include/stdc-predef.h b/include/stdc-predef.h
index 146bc5c2b5..788669f1fe 100644
--- a/include/stdc-predef.h
+++ b/include/stdc-predef.h
@@ -30,8 +30,9 @@
 #define __STDC_IEC_559__		1
 #define __STDC_IEC_559_COMPLEX__	1
 
-/* wchar_t uses ISO 10646-1 (2nd ed., published 2000-09-15) / Unicode 3.1.  */
-#define __STDC_ISO_10646__		200009L
+/* wchar_t uses ISO/IEC 10646 (2nd ed., published 2011-03-15) /
+   Unicode 6.0.  */
+#define __STDC_ISO_10646__		201103L
 
 /* We do not support C11 <threads.h>.  */
 #define __STDC_NO_THREADS__		1