diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-10 16:07:45 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-10 17:05:57 -0800 |
| commit | 751771a8976f909af772e35c167bd7e3ffbe44c8 (patch) | |
| tree | bc9ed8f9312625626e3547c3c3ca1201a37bb81f /src/vm/dwreport.cpp | |
| parent | e5f2df239b546ac9ed2417506c90af222eaf1013 (diff) | |
| download | coreclr-751771a8976f909af772e35c167bd7e3ffbe44c8.tar.gz coreclr-751771a8976f909af772e35c167bd7e3ffbe44c8.tar.bz2 coreclr-751771a8976f909af772e35c167bd7e3ffbe44c8.zip | |
Remove always defined FEATURE_CORESYSTEM
Diffstat (limited to 'src/vm/dwreport.cpp')
| -rw-r--r-- | src/vm/dwreport.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/vm/dwreport.cpp b/src/vm/dwreport.cpp index 5ae4f84de2..67a9fb66b2 100644 --- a/src/vm/dwreport.cpp +++ b/src/vm/dwreport.cpp @@ -127,13 +127,8 @@ public: operator HMODULE() { return hModule; } }; -#ifndef FEATURE_CORESYSTEM -#define WER_MODULE_NAME_W WINDOWS_KERNEL32_DLLNAME_W -typedef SimpleModuleHolder<WszGetModuleHandle, false> WerModuleHolder; -#else #define WER_MODULE_NAME_W W("api-ms-win-core-windowserrorreporting-l1-1-0.dll") typedef SimpleModuleHolder<CLRLoadLibrary, true> WerModuleHolder; -#endif //------------------------------------------------------------------------------ // Description @@ -216,13 +211,11 @@ BOOL RegisterOutOfProcessWatsonCallbacks() WCHAR wszDACName[] = MAIN_DAC_MODULE_NAME_W W(".dll"); WerModuleHolder hWerModule(WER_MODULE_NAME_W); -#ifdef FEATURE_CORESYSTEM if ((hWerModule == NULL) && !RunningOnWin8()) { // If we are built for CoreSystemServer, but are running on Windows 7, we need to look elsewhere hWerModule = WerModuleHolder(W("Kernel32.dll")); } -#endif if (hWerModule == NULL) { @@ -264,15 +257,10 @@ BOOL RegisterOutOfProcessWatsonCallbacks() LL_ERROR, "WATSON support: failed to register DAC dll with WerRegisterRuntimeExceptionModule"); -#ifdef FEATURE_CORESYSTEM // For CoreSys we *could* be running on a platform that doesn't have Watson proper // (the APIs might exist but they just fail). // WerRegisterRuntimeExceptionModule may return E_NOIMPL. return TRUE; -#else // FEATURE_CORESYSTEM - _ASSERTE(! "WATSON support: failed to register DAC dll with WerRegisterRuntimeExceptionModule"); - return FALSE; -#endif // FEATURE_CORESYSTEM } STRESS_LOG0(LF_STARTUP, |