From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= Date: Fri, 17 Jun 2016 23:31:43 +0200 Subject: Portability fixes This patches fixes the build on armel/m68k (changes to CppUTestConfig.h) and to s390x/ppc64/sparc64 (changes to tests/CppUTestExt/MockSupport_cTest.cpp). Bug: https://github.com/cpputest/cpputest/issues/1004 --- include/CppUTest/CppUTestConfig.h | 2 +- tests/CppUTestExt/MockSupport_cTest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/CppUTest/CppUTestConfig.h b/include/CppUTest/CppUTestConfig.h index 9be2585..54cfc2d 100644 --- a/include/CppUTest/CppUTestConfig.h +++ b/include/CppUTest/CppUTestConfig.h @@ -174,7 +174,7 @@ #if CPPUTEST_USE_STD_C_LIB && (!defined(_MSC_VER) || (_MSC_VER >= 1800)) #define CPPUTEST_HAVE_FENV -#if defined(__WATCOMC__) +#if defined(__WATCOMC__) || defined(__ARMEL__) || defined(__m68k__) #define CPPUTEST_FENV_IS_WORKING_PROPERLY 0 #else #define CPPUTEST_FENV_IS_WORKING_PROPERLY 1 diff --git a/tests/CppUTestExt/MockSupport_cTest.cpp b/tests/CppUTestExt/MockSupport_cTest.cpp index 8fc55ec..5188857 100644 --- a/tests/CppUTestExt/MockSupport_cTest.cpp +++ b/tests/CppUTestExt/MockSupport_cTest.cpp @@ -186,8 +186,8 @@ TEST(MockSupport_c, outputParameters_differentType) TEST(MockSupport_c, outputParametersOfType) { - long param = 1; - const long retval = 2; + int param = 1; + const int retval = 2; mock_c()->installCopier("typeName", typeCopy); mock_c()->expectOneCall("foo")->withOutputParameterOfTypeReturning("typeName", "out", &retval); mock_c()->actualCall("foo")->withOutputParameterOfType("typeName", "out", ¶m);