From 972e86c243974d49047328b0dccd72eb44ca493a Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Fri, 20 Jan 2017 21:21:08 -0800 Subject: Fix build break with strict warning settings (#2558) --- src/Native/Runtime/PalRedhawkCommon.h | 2 +- src/Native/Runtime/startup.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Native/Runtime/PalRedhawkCommon.h b/src/Native/Runtime/PalRedhawkCommon.h index 882d5a3f6..2b0008888 100644 --- a/src/Native/Runtime/PalRedhawkCommon.h +++ b/src/Native/Runtime/PalRedhawkCommon.h @@ -118,7 +118,7 @@ struct PAL_LIMITED_CONTEXT #endif // _TARGET_ARM_ }; -void __stdcall RuntimeThreadShutdown(void* thread); +void RuntimeThreadShutdown(void* thread); #ifdef PLATFORM_UNIX typedef Int32 (*PHARDWARE_EXCEPTION_HANDLER)(UIntNative faultCode, UIntNative faultAddress, PAL_LIMITED_CONTEXT* palContext, UIntNative* arg0Reg, UIntNative* arg1Reg); diff --git a/src/Native/Runtime/startup.cpp b/src/Native/Runtime/startup.cpp index 3a368191b..41e5c994f 100644 --- a/src/Native/Runtime/startup.cpp +++ b/src/Native/Runtime/startup.cpp @@ -261,18 +261,20 @@ void DllThreadDetach() } } -void __stdcall RuntimeThreadShutdown(void* thread) +void RuntimeThreadShutdown(void* thread) { // Note: loader lock is normally *not* held here! // The one exception is that the loader lock may be held during the thread shutdown callback // that is made for the single thread that runs the final stages of orderly process // shutdown (i.e., the thread that delivers the DLL_PROCESS_DETACH notifications when the // process is being torn down via an ExitProcess call). -#if HAVE_THREAD_LOCAL + + UNREFERENCED_PARAMETER(thread); + +#if _WIN32 || HAVE_THREAD_LOCAL // If the current Unix platform doesn't support thread_local, we don't get the thread pointer // as the parameter, we just get NULL, so we can check the thread validity only if the // thread_local is supported - UNREFERENCED_PARAMETER(thread); ASSERT((Thread*)thread == ThreadStore::GetCurrentThread()); #endif -- cgit v1.2.3