projects
/
platform
/
upstream
/
coreclr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c6efc70
)
Fix build break on Unix
author
Jan Kotas
<jkotas@microsoft.com>
Thu, 7 May 2015 16:39:14 +0000
(09:39 -0700)
committer
Jan Kotas
<jkotas@microsoft.com>
Thu, 7 May 2015 16:39:14 +0000
(09:39 -0700)
src/vm/dllimport.cpp
patch
|
blob
|
history
diff --git
a/src/vm/dllimport.cpp
b/src/vm/dllimport.cpp
index
c707596
..
a742aa3
100644
(file)
--- 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