From fa6222d52a81c24077206cf5082b2f3967e67ebc Mon Sep 17 00:00:00 2001 From: SaeHie Park Date: Wed, 30 Nov 2016 23:21:04 +0900 Subject: [PATCH] [x86/Linux] Fix prototype for GCThreadStub (#8397) Fix compile error for x86/Linux - fix "cannot initialize a parameter of type 'LPTHREAD_START_ROUTINE'" - add __stdcall GCThreadStub as it's Windows/Linux common code --- src/vm/gcenv.os.cpp | 2 +- tests/src/Common/Platform/platformdefines.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vm/gcenv.os.cpp b/src/vm/gcenv.os.cpp index 896dce6..bfd9c4c 100644 --- a/src/vm/gcenv.os.cpp +++ b/src/vm/gcenv.os.cpp @@ -639,7 +639,7 @@ struct GCThreadStubParam }; // GC thread stub to convert GC thread function to an OS specific thread function -static DWORD GCThreadStub(void* param) +static DWORD __stdcall GCThreadStub(void* param) { WRAPPER_NO_CONTRACT; diff --git a/tests/src/Common/Platform/platformdefines.h b/tests/src/Common/Platform/platformdefines.h index c196b0c..0961e86 100644 --- a/tests/src/Common/Platform/platformdefines.h +++ b/tests/src/Common/Platform/platformdefines.h @@ -72,7 +72,7 @@ LPWSTR HackyConvertToWSTR(char* pszInput); typedef pthread_t THREAD_ID; typedef void* (*MacWorker)(void*); -typedef DWORD (*LPTHREAD_START_ROUTINE)(void*); +typedef DWORD __stdcall (*LPTHREAD_START_ROUTINE)(void*); #ifdef UNICODE typedef WCHAR TCHAR; #else // ANSI -- 2.7.4