diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-24 21:17:24 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-24 21:17:24 +0000 |
| commit | f7af24c7de14ccb10a24909a6f3440a763cb1164 (patch) | |
| tree | a17cf98a60d67d6b32fb699c0ec6308b4a707d94 /src | |
| parent | b0d1c08ff2dc98a1f2ed395ccfed5585ff048d2b (diff) | |
| download | googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.tar.gz googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.tar.bz2 googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.zip | |
Simplifies gmock code using gtest's OS-indicating macros.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gmock-printers.cc | 4 | ||||
| -rw-r--r-- | src/gmock_main.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gmock-printers.cc b/src/gmock-printers.cc index 0473dba1..8efba782 100644 --- a/src/gmock-printers.cc +++ b/src/gmock-printers.cc @@ -55,13 +55,13 @@ namespace { 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 85689d5d..0a3071bf 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 |