am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."

* commit '31631861647aadc28d6311a211419be79c34c7b0':
  Add guards to prevent typedefs when C++11 is available.
This commit is contained in:
Tim Murray 2014-04-07 22:00:12 +00:00 committed by Android Git Automerger
commit 83fd6375f6

View file

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