From dfdbe61d28dbf3e45b6108d739170482ca19a03c Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Wed, 16 Jul 2014 11:53:31 -0700 Subject: Do not typedef char16_t if it is a keyword. Don't define char16_t on platforms where char16_t is a keyword, as C11 and C++11 define it to be. Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a --- include/cutils/jstring.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '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); -- cgit v1.1