diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-07 22:12:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-07 22:12:07 +0000 |
| commit | 4854a36e2a26afb248304fde9738fa6009c14190 (patch) | |
| tree | edd96a9e7fb83dfd9a8843ffa5011a02bf811c53 /include/utils | |
| parent | 3b9e3a10f94c5d4d1f6d9b7ca4054400cf3d2c85 (diff) | |
| parent | 1f87d3ab8c384d03d1496c63f7faad15bd5eeba9 (diff) | |
| download | system_core-4854a36e2a26afb248304fde9738fa6009c14190.zip system_core-4854a36e2a26afb248304fde9738fa6009c14190.tar.gz system_core-4854a36e2a26afb248304fde9738fa6009c14190.tar.bz2 | |
am 1f87d3ab: am 83fd6375: am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."
* commit '1f87d3ab8c384d03d1496c63f7faad15bd5eeba9':
Add guards to prevent typedefs when C++11 is available.
Diffstat (limited to 'include/utils')
| -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 *); |