diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/strongname/api/strongname.cpp | 14 | ||||
| -rw-r--r-- | src/vm/pefile.cpp | 4 | ||||
| -rw-r--r-- | src/vm/peimage.inl | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/strongname/api/strongname.cpp b/src/strongname/api/strongname.cpp index e26199d409..1a8ef65c04 100644 --- a/src/strongname/api/strongname.cpp +++ b/src/strongname/api/strongname.cpp @@ -113,9 +113,9 @@ enum StrongNameCachedCsp { // allocated lazily as needed. struct SN_THREAD_CTX { DWORD m_dwLastError; -#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#if !defined(FEATURE_CORECLR) HCRYPTPROV m_hProv[CachedCspCount]; -#endif // !FEATURE_CORECLR || (CROSSGEN_COMPILE && !PLATFORM_UNIX) +#endif // !FEATURE_CORECLR }; #endif // !DACCESS_COMPILE @@ -199,7 +199,7 @@ struct SN_THREAD_CTX { #endif // FEATURE_WINDOWSPHONE #endif // FEATURE_CORECLR -#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#if !defined(FEATURE_CORECLR) #ifdef FEATURE_STRONGNAME_MIGRATION #include "caparser.h" @@ -4667,11 +4667,11 @@ ErrExit: #endif // #ifndef DACCESS_COMPILE -#else // !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#else // !defined(FEATURE_CORECLR) #define InitStrongName() S_OK -#endif // !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#endif // !defined(FEATURE_CORECLR) // Free buffer allocated by routines below. @@ -4697,12 +4697,12 @@ SN_THREAD_CTX *GetThreadContext() if (pThreadCtx == NULL) return NULL; pThreadCtx->m_dwLastError = S_OK; -#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#if !defined(FEATURE_CORECLR) for (ULONG i = 0; i < CachedCspCount; i++) { pThreadCtx->m_hProv[i] = NULL; } -#endif // !FEATURE_CORECLR || (CROSSGEN_COMPILE && !PLATFORM_UNIX) +#endif // !FEATURE_CORECLR EX_TRY { ClrFlsSetValue(TlsIdx_StrongName, pThreadCtx); diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp index 9875e5800d..220a3bbb91 100644 --- a/src/vm/pefile.cpp +++ b/src/vm/pefile.cpp @@ -4344,7 +4344,7 @@ void PEAssembly::VerifyStrongName() #endif // !defined(FEATURE_CORECLR) else { -#if defined(FEATURE_CORECLR) && (!defined(CROSSGEN_COMPILE) || defined(PLATFORM_UNIX)) +#if defined(FEATURE_CORECLR) // Runtime policy on CoreCLR is to skip verification of ALL assemblies m_flags |= PEFILE_SKIP_MODULE_HASH_CHECKS; m_fStrongNameVerified = TRUE; @@ -4397,7 +4397,7 @@ void PEAssembly::VerifyStrongName() #endif } -#endif // FEATURE_CORECLR && (!CROSSGEN_COMPILE || PLATFORM_UNIX) +#endif // FEATURE_CORECLR } m_fStrongNameVerified = TRUE; diff --git a/src/vm/peimage.inl b/src/vm/peimage.inl index c2f6957ba0..2f4d7d4f31 100644 --- a/src/vm/peimage.inl +++ b/src/vm/peimage.inl @@ -405,7 +405,7 @@ inline const BOOL PEImage::HasStrongNameSignature() #ifndef DACCESS_COMPILE -#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#if !defined(FEATURE_CORECLR) inline const HRESULT PEImage::VerifyStrongName(DWORD* verifyOutputFlags) { WRAPPER_NO_CONTRACT; @@ -445,7 +445,7 @@ inline const HRESULT PEImage::VerifyStrongName(DWORD* verifyOutputFlags) } return hr; } -#endif // !FEATURE_CORECLR || (CROSSGEN_COMPILE && !PLATFORM_UNIX) +#endif // !FEATURE_CORECLR #endif // !DACCESS_COMPILE |