diff options
| author | Yi Zhang (CLR) <yzha@microsoft.com> | 2016-05-03 23:02:10 -0700 |
|---|---|---|
| committer | Yi Zhang <yzha@microsoft.com> | 2016-05-16 22:46:58 -0700 |
| commit | 8c85c81d4a0cb4d2ba9fd14fdcbce51c9d715e25 (patch) | |
| tree | cd1e2006cac6e84025f1d87dabb919debda33b63 /src/vm/method.cpp | |
| parent | 97b4ff0b438261ba11b357008630076054a6f25d (diff) | |
| download | coreclr-8c85c81d4a0cb4d2ba9fd14fdcbce51c9d715e25.tar.gz coreclr-8c85c81d4a0cb4d2ba9fd14fdcbce51c9d715e25.tar.bz2 coreclr-8c85c81d4a0cb4d2ba9fd14fdcbce51c9d715e25.zip | |
Enable DefaultDllImportSearchPathsAttribute in CoreCLR Windows. Host NATIVE_DLL_SEARCH_DIRECTORIES has higher priority.
Diffstat (limited to 'src/vm/method.cpp')
| -rw-r--r-- | src/vm/method.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/vm/method.cpp b/src/vm/method.cpp index 1c7fce9c3a..70714b710d 100644 --- a/src/vm/method.cpp +++ b/src/vm/method.cpp @@ -139,7 +139,6 @@ BOOL MethodDesc::IsIntrospectionOnly() } /*********************************************************************/ -#ifndef FEATURE_CORECLR #ifndef DACCESS_COMPILE BOOL NDirectMethodDesc::HasDefaultDllImportSearchPathsAttribute() { @@ -172,7 +171,6 @@ BOOL NDirectMethodDesc::HasDefaultDllImportSearchPathsAttribute() return (ndirect.m_wFlags & kDefaultDllImportSearchPathsStatus) != 0; } #endif //!DACCESS_COMPILE -#endif // !FEATURE_CORECLR //******************************************************************************* #ifndef DACCESS_COMPILE @@ -3111,13 +3109,11 @@ void MethodDesc::Save(DataImage *image) // Make sure that the marshaling required flag is computed pNMD->MarshalingRequired(); -#ifndef FEATURE_CORECLR if (!pNMD->IsQCall()) { //Cache DefaultImportDllImportSearchPaths attribute. pNMD->HasDefaultDllImportSearchPathsAttribute(); } -#endif image->StoreStructure(pNMD->GetWriteableData(), sizeof(NDirectWriteableData), |