openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 7e5c7b95: am baab180c: Merge "Do not typedef char16_t if it is a keyword." 

* commit '7e5c7b9567ffa7efce13a84ea19c5865cbf5b4c4':
  Do not typedef char16_t if it is a keyword.
This commit is contained in:
Hans Boehm 2014-07-17 12:59:41 +00:00 committed by Android Git Automerger
parent 834f53cf20 7e5c7b9567
commit 66d8a52ba6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/cutils/jstring.h
View File

@ -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);