Merge pull request #899 from bukulin/master

Compilation fixes for OpenBSD-5.8
cpputest · Mar 13, 2016 · 2f4f492 · 2f4f492
2 parents 058b516 + 36e9c6a
commit 2f4f492
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -44,6 +44,12 @@ if (MINGW)
     set(THREAD_LIB "pthread")
 endif (MINGW)
 
+if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "OpenBSD")
+   set (THREADS_HAVE_PTHREAD_ARG 1)
+   find_package (Threads REQUIRED)
+   set (THREAD_LIB "pthread")
+endif ()
+
 add_executable(CppUTestTests ${CppUTestTests_src})
 cpputest_set_test_output_location(CppUTestTests "${CMAKE_BINARY_DIR}/tests")
 target_link_libraries(CppUTestTests CppUTest ${THREAD_LIB})

diff --git a/tests/CppUTestExt/MockSupport_cTestCFile.c b/tests/CppUTestExt/MockSupport_cTestCFile.c
@@ -57,7 +57,7 @@ void all_mock_support_c_calls(void)
             withPointerParameters("pointer", (void*) 1)->
             withConstPointerParameters("constpointer", (const void*) 1)->
             withFunctionPointerParameters("functionpointer", (void(*)()) 1)->
-            withMemoryBufferParameter("name", (void*) 1, 0)->
+            withMemoryBufferParameter("name", (void*) 1, 0UL)->
             ignoreOtherParameters();
 
     mock_c()->actualCall("boo")->withIntParameters("integer", 1)->
@@ -69,12 +69,12 @@ void all_mock_support_c_calls(void)
             withPointerParameters("pointer", (void*) 1)->
             withConstPointerParameters("constpointer", (const void*) 1)->
             withFunctionPointerParameters("functionpointer", (void(*)()) 1)->
-            withMemoryBufferParameter("name", (void*) 1, 0)->
+            withMemoryBufferParameter("name", (void*) 1, 0UL)->
             hasReturnValue();
 
     mock_c()->disable();
     mock_c()->expectOneCall("boo")->withParameterOfType("type", "name", (void*) 1)->
-            withOutputParameterReturning("name", (void*)1, 0)->
+            withOutputParameterReturning("name", (void*)1, 0UL)->
             withOutputParameterOfTypeReturning("type", "name", (void*)1);
     mock_c()->actualCall("boo")->withParameterOfType("type", "name", (void*) 1)->
             withOutputParameter("name", (void*)1)->