diff options
| author | Ted Ross <tross@apache.org> | 2011-05-18 02:14:07 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2011-05-18 02:14:07 +0000 |
| commit | eca0963bf440a08ed4ee7abc2ea66cc50fa01f43 (patch) | |
| tree | 2a530f3a690e6bafca5819ee90fe2b4427e603a4 /cpp/src/tests | |
| parent | 111effbd4a988a0fc96d00034f4662ba6c7ebb9f (diff) | |
| download | qpid-python-eca0963bf440a08ed4ee7abc2ea66cc50fa01f43.tar.gz | |
QPID-2905 - Code modifications to enable Windows builds with the mingw32 compiler.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1104662 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/TimerTest.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/tests/windows/DisableWin32ErrorWindows.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/tests/TimerTest.cpp b/cpp/src/tests/TimerTest.cpp index 7df94164e0..6a0a196f4e 100644 --- a/cpp/src/tests/TimerTest.cpp +++ b/cpp/src/tests/TimerTest.cpp @@ -77,8 +77,10 @@ class TestTask : public TimerTask BOOST_CHECK(fired); BOOST_CHECK_EQUAL(expected_position, position); Duration actual(start, end); -#ifdef _WIN32 +#ifdef _MSC_VER uint64_t difference = _abs64(expected - actual); +#elif defined(_WIN32) + uint64_t difference = labs(expected - actual); #else uint64_t difference = abs(expected - actual); #endif diff --git a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp b/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp index a0b665db73..024f20b147 100644 --- a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp +++ b/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp @@ -26,7 +26,9 @@ // include this file with the executable being built. If the default // behaviors are desired, don't include this file in the build. +#if defined(_MSC_VER) #include <crtdbg.h> +#endif #include <windows.h> #include <iostream> @@ -53,12 +55,14 @@ static redirect_errors_to_stderr block; redirect_errors_to_stderr::redirect_errors_to_stderr() { +#if defined(_MSC_VER) _CrtSetReportMode (_CRT_WARN, _CRTDBG_MODE_FILE); _CrtSetReportFile (_CRT_WARN, _CRTDBG_FILE_STDERR); _CrtSetReportMode (_CRT_ERROR, _CRTDBG_MODE_FILE); _CrtSetReportFile (_CRT_ERROR, _CRTDBG_FILE_STDERR); _CrtSetReportMode (_CRT_ASSERT, _CRTDBG_MODE_FILE); _CrtSetReportFile (_CRT_ASSERT, _CRTDBG_FILE_STDERR); +#endif // Prevent the system from displaying the critical-error-handler // and can't-open-file message boxes. |