diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-07 21:54:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-07 21:54:26 +0000 |
| commit | 31631861647aadc28d6311a211419be79c34c7b0 (patch) | |
| tree | 6ee02fe2d08663d59371042f908de0e1d908f5c3 /include | |
| parent | 6b91fefdb22b33d7cdebe10fab4db834f5f8784d (diff) | |
| parent | ae83f84548ef3878625c5df9bf50b7f991852430 (diff) | |
| download | system_core-31631861647aadc28d6311a211419be79c34c7b0.zip system_core-31631861647aadc28d6311a211419be79c34c7b0.tar.gz system_core-31631861647aadc28d6311a211419be79c34c7b0.tar.bz2 | |
Merge "Add guards to prevent typedefs when C++11 is available."
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/Unicode.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 *); |