Simplifies gmock code using gtest's OS-indicating macros.
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc
index 772f060..5d05bc5 100644
--- a/test/gmock-actions_test.cc
+++ b/test/gmock-actions_test.cc
@@ -70,9 +70,9 @@
using testing::ReturnRef;
using testing::SetArgumentPointee;
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
using testing::SetErrnoAndReturn;
-#endif // _WIN32_WCE
+#endif
#if GMOCK_HAS_PROTOBUF_
using testing::internal::TestMessage;
@@ -911,7 +911,7 @@
EXPECT_DOUBLE_EQ(5, x);
}
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
class SetErrnoAndReturnTest : public testing::Test {
protected:
@@ -938,7 +938,7 @@
EXPECT_EQ(EINVAL, errno);
}
-#endif // _WIN32_WCE
+#endif // !GTEST_OS_WINDOWS_MOBILE
// Tests ByRef().
diff --git a/test/gmock_link_test.h b/test/gmock_link_test.h
index b903f3c..bbac8ae 100644
--- a/test/gmock_link_test.h
+++ b/test/gmock_link_test.h
@@ -116,7 +116,7 @@
#include <gmock/gmock.h>
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
#include <errno.h>
#endif
@@ -176,18 +176,18 @@
using testing::WithArgs;
using testing::WithoutArgs;
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
using testing::SetErrnoAndReturn;
-#endif // _WIN32_WCE
+#endif
#if GTEST_HAS_EXCEPTIONS
using testing::Throw;
-#endif // GTEST_HAS_EXCEPTIONS
+#endif
#if GMOCK_HAS_REGEX
using testing::ContainsRegex;
using testing::MatchesRegex;
-#endif // GMOCK_HAS_REGEX
+#endif
class Interface {
public:
@@ -297,7 +297,7 @@
mock.VoidFromString(&ch);
}
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
// Tests the linkage of the SetErrnoAndReturn action.
TEST(LinkTest, TestSetErrnoAndReturn) {
@@ -309,7 +309,7 @@
errno = saved_errno;
}
-#endif // _WIN32_WCE
+#endif // !GTEST_OS_WINDOWS_MOBILE
// Tests the linkage of the Invoke(function) and Invoke(object, method) actions.
TEST(LinkTest, TestInvoke) {