Skip to content

Commit

Permalink
Fix mismatch between signature and implementation of ActivationFuncti…
Browse files Browse the repository at this point in the history
…ons (dotnet/coreclr#8394)

Commit migrated from dotnet/coreclr@1ab34fa
  • Loading branch information
parjong authored and janvorli committed Nov 30, 2016
1 parent 9bc06ea commit c721a22
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/coreclr/src/vm/threads.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/src/vm/threadsuspend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();

Expand Down

0 comments on commit c721a22

Please sign in to comment.