From: Jan Kotas Date: Thu, 7 May 2015 16:39:14 +0000 (-0700) Subject: Fix build break on Unix X-Git-Tag: accepted/tizen/base/20180629.140029~6708^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dc29d63c5f7ba5f78b6137ca6e83052ed040bdb;p=platform%2Fupstream%2Fcoreclr.git Fix build break on Unix --- diff --git a/src/vm/dllimport.cpp b/src/vm/dllimport.cpp index c707596..a742aa3 100644 --- a/src/vm/dllimport.cpp +++ b/src/vm/dllimport.cpp @@ -6807,6 +6807,7 @@ HMODULE NDirect::LoadLibraryModuleViaHost(NDirectMethodDesc * pMD, AppDomain* pD return NULL; } +#ifdef FEATURE_COMINTEROP CLRPrivBinderWinRT *pWinRTBinder = pDomain->GetWinRtBinder(); if (AreSameBinderInstance(pCurrentBinder, pWinRTBinder)) { @@ -6816,6 +6817,7 @@ HMODULE NDirect::LoadLibraryModuleViaHost(NDirectMethodDesc * pMD, AppDomain* pD // For this, we should use the standard mechanism to make pinvoke call as well. return NULL; } +#endif // FEATURE_COMINTEROP //Step 1: If the assembly was not bound using TPA, // Call System.Runtime.Loader.AssemblyLoadContext.ResolveUnamanagedDll to give