From 5017fe0090e8902d028ba38753c00d73f16d83f0 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Fri, 11 Mar 2011 23:05:00 +0000 Subject: Fixes compatibility with Sun C++ (by Hady Zalek); fixes compatibility with Android (by Zachary Vorhies). --- src/gtest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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++); -- cgit v1.2.3