diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-11 23:05:00 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-11 23:05:00 +0000 |
| commit | 5017fe0090e8902d028ba38753c00d73f16d83f0 (patch) | |
| tree | 855028aed973341aa041ee2468a0bd5293853616 /src | |
| parent | 5451ffe816cafe4f0f51813eb8ddedb3543f0fea (diff) | |
| download | googletest-5017fe0090e8902d028ba38753c00d73f16d83f0.tar.gz googletest-5017fe0090e8902d028ba38753c00d73f16d83f0.tar.bz2 googletest-5017fe0090e8902d028ba38753c00d73f16d83f0.zip | |
Fixes compatibility with Sun C++ (by Hady Zalek); fixes compatibility
with Android (by Zachary Vorhies).
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index 3859d5ab..a48aea9a 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -1621,11 +1621,11 @@ bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs, #if GTEST_OS_WINDOWS return _wcsicmp(lhs, rhs) == 0; -#elif GTEST_OS_LINUX +#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID return wcscasecmp(lhs, rhs) == 0; #else - // Mac OS X and Cygwin don't define wcscasecmp. Other unknown OSes - // may not define it either. + // Android, Mac OS X and Cygwin don't define wcscasecmp. + // Other unknown OSes may not define it either. wint_t left, right; do { left = towlower(*lhs++); |