diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-05-05 23:17:18 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-05-05 23:17:18 -0700 |
| commit | b7273d6f8a6b0b0772c429151bfcbd27cba195fb (patch) | |
| tree | a756731bfc852b499fc0e46cb13684efcfeb0023 /src/vm | |
| parent | 5aff14891c73eb3eca0506107a148652726ac0bf (diff) | |
| download | coreclr-b7273d6f8a6b0b0772c429151bfcbd27cba195fb.tar.gz coreclr-b7273d6f8a6b0b0772c429151bfcbd27cba195fb.tar.bz2 coreclr-b7273d6f8a6b0b0772c429151bfcbd27cba195fb.zip | |
Minor AssemblyLoadContext fixes
Ifdefed out Windows-specific code for Unix
Fixed typo
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/dllimport.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vm/dllimport.cpp b/src/vm/dllimport.cpp index a5d83853a6..c5887a9765 100644 --- a/src/vm/dllimport.cpp +++ b/src/vm/dllimport.cpp @@ -6774,12 +6774,14 @@ HMODULE NDirect::LoadLibraryModuleViaHost(NDirectMethodDesc * pMD, AppDomain* pD //Dynamic Pinvoke Support: //Check if we need to provide the host a chance to provide the unmanaged dll +#ifndef PLATFORM_UNIX // Prevent Overriding of Windows API sets. // This is replicating quick check from the OS implementation of api sets. if (SString::_wcsnicmp(wszLibName, W("api-"), 4) == 0 || SString::_wcsnicmp(wszLibName, W("ext-"), 4) == 0) { return NULL; } +#endif LPVOID hmod = NULL; CLRPrivBinderCoreCLR *pTPABinder = pDomain->GetTPABinderContext(); @@ -6940,7 +6942,7 @@ HINSTANCE NDirect::LoadLibraryModule( NDirectMethodDesc * pMD, LoadLibErrorTrack hmod = GetCLRModule(); #endif // FEATURE_PAL -#if defined(FEATURE_CORESYSTEM) && !defined(FEATURE_PAL) +#if defined(FEATURE_CORESYSTEM) && !defined(PLATFORM_UNIX) if (hmod == NULL) { // Try to go straight to System32 for Windows API sets. This is replicating quick check from |