diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-12 15:32:54 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:58:50 -0800 |
| commit | 206b6a7efbc2e947eff900f448b86573b77ae392 (patch) | |
| tree | 1047a9631b0eba294a37571bc4384309308220f1 /src/debug | |
| parent | 764b57ba3b7494a8391f32fea688c46247dc9336 (diff) | |
| download | coreclr-206b6a7efbc2e947eff900f448b86573b77ae392.tar.gz coreclr-206b6a7efbc2e947eff900f448b86573b77ae392.tar.bz2 coreclr-206b6a7efbc2e947eff900f448b86573b77ae392.zip | |
Remove remainder of FEATURE_CORECLR (tool missed some files, also comments)
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/di/cordb.cpp | 4 | ||||
| -rw-r--r-- | src/debug/di/rsmain.cpp | 4 | ||||
| -rw-r--r-- | src/debug/ee/debugger.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/debug/di/cordb.cpp b/src/debug/di/cordb.cpp index c993fa095f..76cfc85ffa 100644 --- a/src/debug/di/cordb.cpp +++ b/src/debug/di/cordb.cpp @@ -86,7 +86,7 @@ HINSTANCE g_hInst; // Instance handle to this piece of code //***************************************************************************** STDAPI CreateCordbObject(int iDebuggerVersion, IUnknown ** ppCordb) { -#if defined(FEATURE_CORECLR) && !defined(FEATURE_DBGIPC_TRANSPORT_DI) && !defined(FEATURE_CORESYSTEM) +#if !defined(FEATURE_DBGIPC_TRANSPORT_DI) && !defined(FEATURE_CORESYSTEM) // This API should not be called for Windows CoreCLR unless we are doing interop-debugging // (which is only supported internally). Use code:CoreCLRCreateCordbObject instead. if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_DbgEnableMixedModeDebugging) == 0) @@ -94,7 +94,7 @@ STDAPI CreateCordbObject(int iDebuggerVersion, IUnknown ** ppCordb) _ASSERTE(!"Deprecated entry point CreateCordbObject() is called on Windows CoreCLR\n"); return E_NOTIMPL; } -#endif // FEATURE_CORECLR && !FEATURE_DBGIPC_TRANSPORT_DI +#endif // !defined(FEATURE_DBGIPC_TRANSPORT_DI) && !defined(FEATURE_CORESYSTEM) if (ppCordb == NULL) { diff --git a/src/debug/di/rsmain.cpp b/src/debug/di/rsmain.cpp index cd2063a5a0..2a93619b2a 100644 --- a/src/debug/di/rsmain.cpp +++ b/src/debug/di/rsmain.cpp @@ -1423,14 +1423,14 @@ bool Cordb::IsInteropDebuggingSupported() // ICorDebug::SetUnmanagedHandler for details. #ifdef FEATURE_INTEROP_DEBUGGING -#if defined(FEATURE_CORECLR) && !defined(FEATURE_CORESYSTEM) +#if !defined(FEATURE_CORESYSTEM) // Interop debugging is only supported internally on CoreCLR. // Check if the special reg key is set. If not, then we don't allow interop debugging. if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_DbgEnableMixedModeDebugging) == 0) { return false; } -#endif // FEATURE_CORECLR +#endif // FEATURE_CORESYSTEM return true; #else diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp index d77227f213..143c44c921 100644 --- a/src/debug/ee/debugger.cpp +++ b/src/debug/ee/debugger.cpp @@ -1964,7 +1964,7 @@ void NotifyDebuggerOfTelestoStartup() g_hContinueStartupEvent = NULL; } -#endif // FEATURE_CORECLR && !FEATURE_PAL +#endif // !FEATURE_PAL //--------------------------------------------------------------------------------------- // @@ -2016,7 +2016,7 @@ HRESULT Debugger::Startup(void) // The transport requires the debug pack to be present. Otherwise it'll raise a fatal error. return S_FALSE; } -#endif // FEATURE_CORECLR && !FEATURE_PAL +#endif // !FEATURE_PAL { DebuggerLockHolder dbgLockHolder(this); |