Merge branch 'master' into mt-trace

[apitrace] / common / os_thread.hpp

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index 6c0b488c0152474a031a82839b0c767777714fdd..5fbdaabf274e0f51304b209f807b133bcb71d55e 100644 (file)
--- a/common/os_thread.hpp
+++ b/common/os_thread.hpp
@@ -348,7 +348,7 @@ private:
             DWORD id = 0;
             _native_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)f, (LPVOID)arg, 0, &id);
 #else
-            pthread_create(&_native_handle, NULL, f, arg);
+            pthread_create(&_native_handle, NULL, ( void *(*) (void *))f, arg);
 #endif
         }