diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2016-04-20 07:44:45 -0700 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-04-20 07:44:45 -0700 |
| commit | 24adf2bead2a19665c86a568af03259697ab7565 (patch) | |
| tree | a739853c5e2ba2d10042201222ae2bac9acda904 /src | |
| parent | 21597ece522339ffdd127508c111a7748963d507 (diff) | |
| parent | af0dda9713323f0a8729f2c653c81dc96c41701e (diff) | |
| download | coreclr-24adf2bead2a19665c86a568af03259697ab7565.tar.gz coreclr-24adf2bead2a19665c86a568af03259697ab7565.tar.bz2 coreclr-24adf2bead2a19665c86a568af03259697ab7565.zip | |
Merge pull request #4433 from krytarowski/netbsd-support-69
Fix issue building mscorlib.dll
Diffstat (limited to 'src')
| -rw-r--r-- | src/vm/win32threadpool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/win32threadpool.cpp b/src/vm/win32threadpool.cpp index fc25f4e7b9..0fa06db559 100644 --- a/src/vm/win32threadpool.cpp +++ b/src/vm/win32threadpool.cpp @@ -2669,7 +2669,7 @@ BOOL ThreadpoolMgr::RegisterWaitForSingleObject(PHANDLE phNewWaitObject, // thread that will PostQueuedCompletionStatus (the dedicated WaitThread). // This event correlates with ThreadPoolIODequeue in ThreadpoolMgr::AsyncCallbackCompletion if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_Context, ThreadPoolIOEnqueue)) - FireEtwThreadPoolIOEnqueue((LPOVERLAPPED)waitInfo, Callback, (dwFlag & WAIT_SINGLE_EXECUTION) == 0, GetClrInstanceId()); + FireEtwThreadPoolIOEnqueue((LPOVERLAPPED)waitInfo, reinterpret_cast<void*>(Callback), (dwFlag & WAIT_SINGLE_EXECUTION) == 0, GetClrInstanceId()); BOOL status = QueueUserAPC((PAPCFUNC)InsertNewWaitForSelf, threadCB->threadHandle, (size_t) waitInfo); @@ -3233,7 +3233,7 @@ DWORD __stdcall ThreadpoolMgr::AsyncCallbackCompletion(PVOID pArgs) // We fire the "dequeue" ETW event here, before executing the user code, to enable correlation with // the ThreadPoolIOEnqueue fired in ThreadpoolMgr::RegisterWaitForSingleObject if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_Context, ThreadPoolIODequeue)) - FireEtwThreadPoolIODequeue(waitInfo, waitInfo->Callback, GetClrInstanceId()); + FireEtwThreadPoolIODequeue(waitInfo, reinterpret_cast<void*>(waitInfo->Callback), GetClrInstanceId()); // the user callback can throw, the host must be prepared to handle it. // SQL is ok, since they have a top-level SEH handler. However, there's |