Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix some build issues on release and macos.
  • Loading branch information
jkoritzinsky committed Oct 28, 2021
commit ae6a6cbacd0f2f3d5358be548fd9776f9512f4c2
8 changes: 4 additions & 4 deletions src/coreclr/vm/interoplibinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,17 @@ class ObjCMarshalNative


extern "C" BOOL QCALLTYPE ObjCMarshal_TryInitializeReferenceTracker(
_In_ BeginEndCallback beginEndCallback,
_In_ IsReferencedCallback isReferencedCallback,
_In_ EnteredFinalizationCallback trackedObjectEnteredFinalization);
_In_ ObjCMarshalNative::BeginEndCallback beginEndCallback,
_In_ ObjCMarshalNative::IsReferencedCallback isReferencedCallback,
_In_ ObjCMarshalNative::EnteredFinalizationCallback trackedObjectEnteredFinalization);

extern "C" void* QCALLTYPE ObjCMarshal_CreateReferenceTrackingHandle(
_In_ QCall::ObjectHandleOnStack obj,
_Out_ int* memInSizeT,
_Outptr_ void** mem);

extern "C" BOOL QCALLTYPE ObjCMarshal_TrySetGlobalMessageSendCallback(
_In_ MessageSendFunction msgSendFunction,
_In_ ObjCMarshalNative::MessageSendFunction msgSendFunction,
_In_ void* fptr);
#endif // FEATURE_OBJCMARSHAL

Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/vm/qcallentrypoints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,9 @@ static const Entry s_QCall[] =
#endif
DllImportEntry(MarshalNative_Prelink)
DllImportEntry(MarshalNative_IsBuiltInComSupported)
#ifdef _DEBUG
DllImportEntry(MarshalNative_GetIsInCooperativeGCModeFunctionPointer)
#endif
#if defined(FEATURE_COMINTEROP)
DllImportEntry(MarshalNative_GetTypeFromCLSID)
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/metadata/native-library-qcall.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ static Entry mono_qcalls[] =
gpointer
mono_lookup_pinvoke_qcall_internal (const char *name)
{
return ResolveDllImport(mono_qcalls, lengthof(mono_qcalls), name);
return (gpointer)ResolveDllImport(mono_qcalls, lengthof(mono_qcalls), name);
}