diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-12 02:53:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 02:53:25 +0000 |
| commit | 977b84140f2314c244f32b2df0913abb0876532b (patch) | |
| tree | 33dcfaef8994dbd2efa1533c8e7e1d1770a5e876 /include | |
| parent | 3e49bbc4c1fdbdf79b0c33ee24407f71ac62102a (diff) | |
| parent | da4f30c5b451091068ecb5f6fa3697a7dd6bb7df (diff) | |
| download | core-977b84140f2314c244f32b2df0913abb0876532b.tar.gz core-977b84140f2314c244f32b2df0913abb0876532b.tar.bz2 core-977b84140f2314c244f32b2df0913abb0876532b.zip | |
am da4f30c5: Merge "Remove incompatible Unicode compatibility types."
* commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df':
Remove incompatible Unicode compatibility types.
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/Unicode.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h index aaf951bd5..b76a5e268 100644 --- a/include/utils/Unicode.h +++ b/include/utils/Unicode.h @@ -22,12 +22,6 @@ extern "C" { -// Definitions exist in C++11 -#if defined __cplusplus && __cplusplus < 201103L -typedef unsigned int char32_t; -typedef unsigned short char16_t; -#endif - // Standard string functions on char16_t strings. int strcmp16(const char16_t *, const char16_t *); int strncmp16(const char16_t *s1, const char16_t *s2, size_t n); |