diff options
author | Kamil Rytarowski <n54@gmx.com> | 2016-02-02 02:52:32 +0100 |
---|---|---|
committer | Kamil Rytarowski <n54@gmx.com> | 2016-02-03 00:53:52 +0100 |
commit | c8df018ab7ffe635af08089a2605bf95516f5d93 (patch) | |
tree | fcb120ac2d40520dbe8e7db4b6331fd2d526b992 /src/vm/threadsuspend.cpp | |
parent | 9e1fb2f4baf6ae995594c54fc3612ea4be3b529f (diff) | |
download | coreclr-c8df018ab7ffe635af08089a2605bf95516f5d93.tar.gz coreclr-c8df018ab7ffe635af08089a2605bf95516f5d93.tar.bz2 coreclr-c8df018ab7ffe635af08089a2605bf95516f5d93.zip |
Fix build on NetBSD: cast ptr to function to ptr to data
Diffstat (limited to 'src/vm/threadsuspend.cpp')
-rw-r--r-- | src/vm/threadsuspend.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp index c1ffaf9246..55d31fff24 100644 --- a/src/vm/threadsuspend.cpp +++ b/src/vm/threadsuspend.cpp @@ -8445,23 +8445,23 @@ void PALAPI HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) ClrFlsValueSwitch threadStackWalking(TlsIdx_StackWalkerWalkingThread, pThread); // Hijack the return address to point to the appropriate routine based on the method's return type. - void *pvHijackAddr = OnHijackScalarTripThread; + void *pvHijackAddr = reinterpret_cast<void*>(OnHijackScalarTripThread); MethodDesc *pMethodDesc = codeInfo.GetMethodDesc(); MethodTable* pMT = NULL; MetaSig::RETURNTYPE type = pMethodDesc->ReturnsObject(INDEBUG_COMMA(false) &pMT); if (type == MetaSig::RETOBJ) { - pvHijackAddr = OnHijackObjectTripThread; + pvHijackAddr = reinterpret_cast<void*>(OnHijackObjectTripThread); } else if (type == MetaSig::RETBYREF) { - pvHijackAddr = OnHijackInteriorPointerTripThread; + pvHijackAddr = reinterpret_cast<void*>(OnHijackInteriorPointerTripThread); } #ifdef FEATURE_UNIX_AMD64_STRUCT_PASSING else if (type == MetaSig::RETVALUETYPE) { pThread->SetHijackReturnTypeClass(pMT->GetClass()); - pvHijackAddr = OnHijackStructInRegsTripThread; + pvHijackAddr = reinterpret_cast<void*>(OnHijackStructInRegsTripThread); } #endif // FEATURE_UNIX_AMD64_STRUCT_PASSING |