summaryrefslogtreecommitdiff
path: root/include/stdc-predef.h
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 15:26:46 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 15:26:46 +0000
commitdf6d86d8822458cf787b5f5620490d6a962da3b8 (patch)
tree8d499fa24a32a195bd6e384dfb70639c45c4a9bb /include/stdc-predef.h
parent2c7242b971fd7b63fa842df15ec6fa3d0ff8aeb0 (diff)
parent1949a12d5da678a8532359a95717d8e63910d93b (diff)
Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chkt/____longjmp_chk
Diffstat (limited to 'include/stdc-predef.h')
-rw-r--r--include/stdc-predef.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/stdc-predef.h b/include/stdc-predef.h
index f9f7f731d1..c2ab78a2d4 100644
--- a/include/stdc-predef.h
+++ b/include/stdc-predef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -49,12 +49,12 @@
# define __STDC_IEC_559_COMPLEX__ 1
#endif
-/* wchar_t uses Unicode 8.0.0. Version 8.0 of the Unicode Standard is
- synchronized with ISO/IEC 10646:2014, plus Amendment 1 (published
- 2015-05-15). */
-#define __STDC_ISO_10646__ 201505L
-
-/* We do not support C11 <threads.h>. */
-#define __STDC_NO_THREADS__ 1
+/* wchar_t uses Unicode 10.0.0. Version 10.0 of the Unicode Standard is
+ synchronized with ISO/IEC 10646:2017, fifth edition, plus
+ the following additions from Amendment 1 to the fifth edition:
+ - 56 emoji characters
+ - 285 hentaigana
+ - 3 additional Zanabazar Square characters */
+#define __STDC_ISO_10646__ 201706L
#endif