aboutsummaryrefslogtreecommitdiffstats
path: root/include/gtest/internal
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-06-19 00:24:28 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-06-19 00:24:28 +0000
commitae3247986bbbafcc913b5fe6132090ad6f1c3f36 (patch)
tree2f098d474cb2f1fc56bcd67a7ef31fe0886da3da /include/gtest/internal
parent532dc2de35f2cef191bc91c3587a9f8f4974756f (diff)
downloadgoogletest-ae3247986bbbafcc913b5fe6132090ad6f1c3f36.tar.gz
googletest-ae3247986bbbafcc913b5fe6132090ad6f1c3f36.tar.bz2
googletest-ae3247986bbbafcc913b5fe6132090ad6f1c3f36.zip
Fixes broken gtest_unittest on Cygwin and cleans it up (by Vlad Losev); fixes the wrong usage of os.environ.clear() in gtest_output_test.py (by Vlad Losev); fixes the logic for detecting Symbian (by Zhanyong Wan); moves TestProperty for event listener (by Vlad Losev).
Diffstat (limited to 'include/gtest/internal')
-rw-r--r--include/gtest/internal/gtest-port.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index e1a3597c..886e2dd8 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -177,7 +177,7 @@
// Determines the platform on which Google Test is compiled.
#ifdef __CYGWIN__
#define GTEST_OS_CYGWIN 1
-#elif __SYMBIAN32__
+#elif defined __SYMBIAN32__
#define GTEST_OS_SYMBIAN 1
#elif defined _WIN32
#define GTEST_OS_WINDOWS 1