Browse Source

Don't redefine char16_t when C++11 is used. (#528)

Zeta 3 years ago
parent
commit
1164d7f28d
1 changed files with 2 additions and 0 deletions
  1. 2 0
      src/hl.h

+ 2 - 0
src/hl.h

@@ -237,8 +237,10 @@ typedef uint16_t uchar;
 #if defined(HL_IOS) || defined(HL_TVOS) || defined(HL_MAC)
 #if defined(HL_IOS) || defined(HL_TVOS) || defined(HL_MAC)
 #include <stddef.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdint.h>
+#if !defined(__cplusplus) || __cplusplus < 201103L
 typedef uint16_t char16_t;
 typedef uint16_t char16_t;
 typedef uint32_t char32_t;
 typedef uint32_t char32_t;
+#endif
 #else
 #else
 #	include <uchar.h>
 #	include <uchar.h>
 #endif
 #endif