Simplifies gmock code using gtest's OS-indicating macros.
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h
index c8edc8a..f7daf82 100644
--- a/include/gmock/gmock-actions.h
+++ b/include/gmock/gmock-actions.h
@@ -606,7 +606,7 @@
const T2 value_;
};
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
// Implements the SetErrnoAndReturn action to simulate return from
// various system calls and libc functions.
@@ -626,7 +626,7 @@
const T result_;
};
-#endif // _WIN32_WCE
+#endif // !GTEST_OS_WINDOWS_MOBILE
// Implements the SetArgumentPointee<N>(x) action for any function
// whose N-th argument (0-based) is a pointer to x's type. The
@@ -912,7 +912,7 @@
return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val));
}
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
// Creates an action that sets errno and returns the appropriate error.
template <typename T>
@@ -922,7 +922,7 @@
internal::SetErrnoAndReturnAction<T>(errval, result));
}
-#endif // _WIN32_WCE
+#endif // !GTEST_OS_WINDOWS_MOBILE
// Various overloads for InvokeWithoutArgs().
diff --git a/src/gmock-printers.cc b/src/gmock-printers.cc
index 0473dba..8efba78 100644
--- a/src/gmock-printers.cc
+++ b/src/gmock-printers.cc
@@ -55,13 +55,13 @@
using ::std::ostream;
-#ifdef _WIN32_WCE // Windows CE does not define _snprintf_s.
+#if GTEST_OS_WINDOWS_MOBILE // Windows CE does not define _snprintf_s.
#define snprintf _snprintf
#elif _MSC_VER >= 1400 // VC 8.0 and later deprecate snprintf and _snprintf.
#define snprintf _snprintf_s
#elif _MSC_VER
#define snprintf _snprintf
-#endif
+#endif // GTEST_OS_WINDOWS_MOBILE
// Prints a segment of bytes in the given object.
void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
diff --git a/src/gmock_main.cc b/src/gmock_main.cc
index 85689d5..0a3071b 100644
--- a/src/gmock_main.cc
+++ b/src/gmock_main.cc
@@ -38,13 +38,13 @@
// is enabled. For this reason instead of _tmain, main function is used on
// Windows. See the following link to track the current status of this bug:
// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=394464 // NOLINT
-#ifdef _WIN32_WCE
+#if GTEST_OS_WINDOWS_MOBILE
#include <tchar.h> // NOLINT
int _tmain(int argc, TCHAR** argv) {
#else
int main(int argc, char** argv) {
-#endif // _WIN32_WCE
+#endif // GTEST_OS_WINDOWS_MOBILE
std::cout << "Running main() from gmock_main.cc\n";
// Since Google Mock depends on Google Test, InitGoogleMock() is
// also responsible for initializing Google Test. Therefore there's
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) {