diff --git a/src/coreclr/src/vm/comdelegate.cpp b/src/coreclr/src/vm/comdelegate.cpp index ac3c4d0083ea5..958a2202a35d1 100644 --- a/src/coreclr/src/vm/comdelegate.cpp +++ b/src/coreclr/src/vm/comdelegate.cpp @@ -1132,7 +1132,7 @@ void COMDelegate::BindToMethod(DELEGATEREF *pRefThis, GCPROTECT_END(); } -#if defined(TARGET_X86) && defined(TARGET_WINDOWS) +#if defined(TARGET_X86) // Marshals a managed method to an unmanaged callback provided the // managed method is static and it's parameters require no marshalling. PCODE COMDelegate::ConvertToCallback(MethodDesc* pMD) @@ -1189,7 +1189,7 @@ PCODE COMDelegate::ConvertToCallback(MethodDesc* pMD) _ASSERTE(pCode != NULL); return pCode; } -#endif // defined(TARGET_X86) && defined(TARGET_WINDOWS) +#endif // defined(TARGET_X86) // Marshals a delegate to a unmanaged callback. LPVOID COMDelegate::ConvertToCallback(OBJECTREF pDelegateObj) diff --git a/src/coreclr/src/vm/comdelegate.h b/src/coreclr/src/vm/comdelegate.h index a87845dbe0ce8..d11d79f9a830a 100644 --- a/src/coreclr/src/vm/comdelegate.h +++ b/src/coreclr/src/vm/comdelegate.h @@ -84,11 +84,11 @@ class COMDelegate // Marshals a delegate to a unmanaged callback. static LPVOID ConvertToCallback(OBJECTREF pDelegate); -#if defined(TARGET_X86) && defined(TARGET_WINDOWS) +#if defined(TARGET_X86) // Marshals a managed method to an unmanaged callback. - // This is only used on x86 Windows. See usage for further details. + // This is only used on x86. See usage for further details. static PCODE ConvertToCallback(MethodDesc* pMD); -#endif // defined(TARGET_X86) && defined(TARGET_WINDOWS) +#endif // defined(TARGET_X86) // Marshals an unmanaged callback to Delegate static OBJECTREF ConvertToDelegate(LPVOID pCallback, MethodTable* pMT); diff --git a/src/coreclr/src/vm/prestub.cpp b/src/coreclr/src/vm/prestub.cpp index e75bc9f1ce7df..cd25aaa0f90e7 100644 --- a/src/coreclr/src/vm/prestub.cpp +++ b/src/coreclr/src/vm/prestub.cpp @@ -439,7 +439,7 @@ PCODE MethodDesc::GetPrecompiledCode(PrepareCodeConfig* pConfig) #ifdef FEATURE_TIERED_COMPILATION bool shouldTier = pConfig->GetMethodDesc()->IsEligibleForTieredCompilation(); -#if !defined(TARGET_X86) || !defined(TARGET_WINDOWS) +#if !defined(TARGET_X86) CallerGCMode callerGcMode = pConfig->GetCallerGCMode(); // If the method is eligible for tiering but is being // called from a Preemptive GC Mode thread or the method @@ -458,7 +458,7 @@ PCODE MethodDesc::GetPrecompiledCode(PrepareCodeConfig* pConfig) codeVersion.SetOptimizationTier(NativeCodeVersion::OptimizationTierOptimized); shouldTier = false; } -#endif // !TARGET_X86 || !TARGET_WINDOWS +#endif // !TARGET_X86 #endif // FEATURE_TIERED_COMPILATION if (pConfig->SetNativeCode(pCode, &pCode))