am 83fd6375: am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."
* commit '83fd6375f6d9016afe9bb03453d39b8c41cda548':
Add guards to prevent typedefs when C++11 is available.
diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h
index c8c87c3..5b98de2 100644
--- a/include/utils/Unicode.h
+++ b/include/utils/Unicode.h
@@ -22,8 +22,11 @@
extern "C" {
+// Definitions exist in C++11
+#if defined __cplusplus && __cplusplus < 201103L
typedef uint32_t char32_t;
typedef uint16_t char16_t;
+#endif
// Standard string functions on char16_t strings.
int strcmp16(const char16_t *, const char16_t *);