From c721a2296845e759213d2c57a3decc6fb3f93304 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Wed, 30 Nov 2016 23:23:29 +0900 Subject: [PATCH] Fix mismatch between signature and implementation of ActivationFunctions (dotnet/coreclr#8394) Commit migrated from https://github.com/dotnet/coreclr/commit/1ab34fa83f5f5479065b85d3d902e533e167ec2d --- src/coreclr/src/vm/threads.h | 2 +- src/coreclr/src/vm/threadsuspend.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/src/vm/threads.h b/src/coreclr/src/vm/threads.h index a4131948ad70a2..144e17c591ac60 100644 --- a/src/coreclr/src/vm/threads.h +++ b/src/coreclr/src/vm/threads.h @@ -1072,7 +1072,7 @@ class Thread: public IUnknown friend DWORD MapWin32FaultToCOMPlusException(EXCEPTION_RECORD *pExceptionRecord); friend void STDCALL OnHijackWorker(HijackArgs * pArgs); #ifdef PLATFORM_UNIX - friend void PALAPI HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext); + friend void HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext); #endif // PLATFORM_UNIX #endif // FEATURE_HIJACK diff --git a/src/coreclr/src/vm/threadsuspend.cpp b/src/coreclr/src/vm/threadsuspend.cpp index 0d16d908b19a5d..2e6563da1ef292 100644 --- a/src/coreclr/src/vm/threadsuspend.cpp +++ b/src/coreclr/src/vm/threadsuspend.cpp @@ -8212,7 +8212,7 @@ void ThreadSuspend::SuspendEE(SUSPEND_REASON reason) // This function is called by PAL to check if the specified instruction pointer // is in a function where we can safely inject activation. -BOOL PALAPI CheckActivationSafePoint(SIZE_T ip, BOOL checkingCurrentThread) +BOOL CheckActivationSafePoint(SIZE_T ip, BOOL checkingCurrentThread) { Thread *pThread = GetThread(); // It is safe to call the ExecutionManager::IsManagedCode only if we are making the check for @@ -8239,7 +8239,7 @@ BOOL PALAPI CheckActivationSafePoint(SIZE_T ip, BOOL checkingCurrentThread) // address to take the thread to the appropriate stub (based on the return // type of the method) which will then handle preparing the thread for GC. // -void PALAPI HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) +void HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) { Thread *pThread = GetThread();