aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorshiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925>2008-09-18 18:06:35 +0000
committershiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925>2008-09-18 18:06:35 +0000
commitf6b0dc0b408f38bb04079b14198d6bdf703e5e56 (patch)
tree44f4cc83029ced9b2281947e2aa9690fbdd6b15d /src
parent9e672bd5e303a9803fa5135c3c9f0122efa4c6bb (diff)
downloadgoogletest-f6b0dc0b408f38bb04079b14198d6bdf703e5e56.tar.gz
googletest-f6b0dc0b408f38bb04079b14198d6bdf703e5e56.tar.bz2
googletest-f6b0dc0b408f38bb04079b14198d6bdf703e5e56.zip
Makes Google Test compile (and all tests pass) on cygwin (possibly on wingw too).
Diffstat (limited to 'src')
-rw-r--r--src/gtest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gtest.cc b/src/gtest.cc
index 8ca6ac8e..8d2d2a2a 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -1546,16 +1546,17 @@ bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
#ifdef GTEST_OS_WINDOWS
return _wcsicmp(lhs, rhs) == 0;
-#elif defined(GTEST_OS_MAC)
- // Mac OS X doesn't define wcscasecmp.
+#elif defined(GTEST_OS_LINUX)
+ return wcscasecmp(lhs, rhs) == 0;
+#else
+ // 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++);
right = towlower(*rhs++);
} while (left && left == right);
return left == right;
-#else
- return wcscasecmp(lhs, rhs) == 0;
#endif // OS selector
}