diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-12 10:58:11 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:55:37 -0800 |
| commit | 9e65011e958ea1668333f63bbd029da67e2db4c9 (patch) | |
| tree | 2386b9ac015a49e50c0be76d20cb2b6c30c426ea | |
| parent | c9850c6172e09fe824e02a6f2e7eb6c4863952d5 (diff) | |
| download | coreclr-9e65011e958ea1668333f63bbd029da67e2db4c9.tar.gz coreclr-9e65011e958ea1668333f63bbd029da67e2db4c9.tar.bz2 coreclr-9e65011e958ea1668333f63bbd029da67e2db4c9.zip | |
Remove always defined FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME
| -rw-r--r-- | clrdefinitions.cmake | 1 | ||||
| -rw-r--r-- | src/debug/di/shimprocess.cpp | 4 | ||||
| -rw-r--r-- | src/inc/cor.h | 10 | ||||
| -rw-r--r-- | src/inc/daccess.h | 5 |
4 files changed, 0 insertions, 20 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 6b4332b180..4226866c66 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -141,7 +141,6 @@ if (NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_MANAGED_ETW) endif(NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) -add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) if(FEATURE_MERGE_JIT_AND_ENGINE) diff --git a/src/debug/di/shimprocess.cpp b/src/debug/di/shimprocess.cpp index a6fc15407e..46c35fdc2b 100644 --- a/src/debug/di/shimprocess.cpp +++ b/src/debug/di/shimprocess.cpp @@ -1850,11 +1850,7 @@ HMODULE ShimProcess::GetDacModule() // mscordaccore.dll <-- coreclr // mscordacwks.dll <-- desktop PCWSTR eeFlavor = -#if defined(FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) W("mscordaccore.dll"); -#else - W("mscordacwks.dll"); -#endif #endif // FEATURE_PAL wszAccessDllPath.Append(eeFlavor); diff --git a/src/inc/cor.h b/src/inc/cor.h index 424500930a..a050eb42aa 100644 --- a/src/inc/cor.h +++ b/src/inc/cor.h @@ -171,7 +171,6 @@ DEPRECATED_CLR_STDAPI_(void) CoUninitializeEE(BOOL fFlags); DEPRECATED_CLR_STDAPI_(void) CoEEShutDownCOM(void); -#ifdef FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME #define MAIN_CLR_MODULE_NAME_W W("coreclr") #define MAIN_CLR_MODULE_NAME_A "coreclr" @@ -179,15 +178,6 @@ DEPRECATED_CLR_STDAPI_(void) CoEEShutDownCOM(void); #define MAIN_CLR_DLL_NAME_W MAKEDLLNAME_W(MAIN_CLR_MODULE_NAME_W) #define MAIN_CLR_DLL_NAME_A MAKEDLLNAME_A(MAIN_CLR_MODULE_NAME_A) -#else //FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME - -#define MAIN_CLR_MODULE_NAME_W L"clr" -#define MAIN_CLR_MODULE_NAME_A "clr" - -#define MAIN_CLR_DLL_NAME_W MAKEDLLNAME_W(MAIN_CLR_MODULE_NAME_W) -#define MAIN_CLR_DLL_NAME_A MAKEDLLNAME_A(MAIN_CLR_MODULE_NAME_A) - -#endif //FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME #define MSCOREE_SHIM_W MAIN_CLR_DLL_NAME_W diff --git a/src/inc/daccess.h b/src/inc/daccess.h index 3e3a62c746..8ca9587a4c 100644 --- a/src/inc/daccess.h +++ b/src/inc/daccess.h @@ -2445,13 +2445,8 @@ typedef DPTR(PTR_PCODE) PTR_PTR_PCODE; #endif // Macros like MAIN_CLR_MODULE_NAME* for the DAC module -#ifdef FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME #define MAIN_DAC_MODULE_NAME_W W("mscordaccore") #define MAIN_DAC_MODULE_DLL_NAME_W W("mscordaccore.dll") -#else -#define MAIN_DAC_MODULE_NAME_W W("mscordacwks") -#define MAIN_DAC_MODULE_DLL_NAME_W W("mscordacwks.dll") -#endif // TARGET_CONSISTENCY_CHECK represents a condition that should not fail unless the DAC target is corrupt. // This is in contrast to ASSERTs in DAC infrastructure code which shouldn't fail regardless of the memory |