commit baab180c2d37157cef66d1c8fb9b0726477a2e18
author Hans Boehm <hboehm@google.com> Thu Jul 17 00:40:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 16 23:43:15 2014 +0000
tree e5f1bc5fafde4b40eeb70c0fa89fbbabe7dc0549
parent 81a640646d3e71dca706cc80579677e35132e365
parent dfdbe61d28dbf3e45b6108d739170482ca19a03c

Merge "Do not typedef char16_t if it is a keyword."

include/cutils/jstring.h

diff --git a/include/cutils/jstring.h b/include/cutils/jstring.h
index ee0018f..a342608 100644
--- a/include/cutils/jstring.h
+++ b/include/cutils/jstring.h
@@ -24,7 +24,10 @@
 extern "C" {
 #endif
 
-typedef uint16_t char16_t;
+#if __STDC_VERSION__ < 201112L && __cplusplus < 201103L
+  typedef uint16_t char16_t;
+#endif
+  // otherwise char16_t is a keyword with the right semantics
 
 extern char * strndup16to8 (const char16_t* s, size_t n);
 extern size_t strnlen16to8 (const char16_t* s, size_t n);