aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs/uchar.h
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs/uchar.h')
-rw-r--r--wcsmbs/uchar.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/wcsmbs/uchar.h b/wcsmbs/uchar.h
index 4d78f70fa2..4d9b2ec14d 100644
--- a/wcsmbs/uchar.h
+++ b/wcsmbs/uchar.h
@@ -28,20 +28,13 @@
#define __need_size_t
#include <stddef.h>
+#include <bits/types.h>
#include <bits/types/mbstate_t.h>
-#if defined __GNUC__ && !defined __USE_ISOCXX11
-/* Define the 16-bit and 32-bit character types. Use the information
- provided by the compiler. */
-# if !defined __CHAR16_TYPE__ || !defined __CHAR32_TYPE__
-# if defined __STDC_VERSION__ && __STDC_VERSION__ < 201000L
-# error "<uchar.h> requires ISO C11 mode"
-# else
-# error "definitions of __CHAR16_TYPE__ and/or __CHAR32_TYPE__ missing"
-# endif
-# endif
-typedef __CHAR16_TYPE__ char16_t;
-typedef __CHAR32_TYPE__ char32_t;
+#ifndef __USE_ISOCXX11
+/* Define the 16-bit and 32-bit character types. */
+typedef __uint_least16_t char16_t;
+typedef __uint_least32_t char32_t;
#endif