diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-01-31 23:42:27 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-31 23:42:27 -0800 |
| commit | 2dd9b89a6dc84795a0f9e2dc93ea6a824ae552e9 (patch) | |
| tree | 26646a7624be759f8b36e251c599ddffd74b83ac /src/debug/di | |
| parent | 1765a84c03a37c9bdb7541cb7db49adad5dae6db (diff) | |
| download | coreclr-2dd9b89a6dc84795a0f9e2dc93ea6a824ae552e9.tar.gz coreclr-2dd9b89a6dc84795a0f9e2dc93ea6a824ae552e9.tar.bz2 coreclr-2dd9b89a6dc84795a0f9e2dc93ea6a824ae552e9.zip | |
Stop defining WIN32 in Unix builds
WIN32 was defined for 32-bit Unix builds in number of places which is incorrect. It caused build break in lldb header since they use WIN32 define for Windows-specific code.
Diffstat (limited to 'src/debug/di')
| -rw-r--r-- | src/debug/di/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/debug/di/shimprocess.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt index aea0320d34..030e150434 100644 --- a/src/debug/di/CMakeLists.txt +++ b/src/debug/di/CMakeLists.txt @@ -6,12 +6,10 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) elseif(CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-D_TARGET_X86_=1) add_definitions(-DDBG_TARGET_32BIT) - add_definitions(-DDBG_TARGET_WIN32=1) add_definitions(-DDBG_TARGET_X86=1) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) add_definitions(-D_TARGET_WIN32_=1) add_definitions(-DDBG_TARGET_32BIT) - add_definitions(-DDBG_TARGET_WIN32=1) add_definitions(-DDBG_TARGET_ARM=1) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-D_TARGET_WIN64_=1) diff --git a/src/debug/di/shimprocess.cpp b/src/debug/di/shimprocess.cpp index d01611d811..f15ab3fff6 100644 --- a/src/debug/di/shimprocess.cpp +++ b/src/debug/di/shimprocess.cpp @@ -678,10 +678,8 @@ CorDebugRecordFormat GetHostExceptionRecordFormat() { #if defined(_WIN64) return FORMAT_WINDOWS_EXCEPTIONRECORD64; -#elif defined(_WIN32) - return FORMAT_WINDOWS_EXCEPTIONRECORD32; #else - C_ASSERTE(!"CorDebugRecordFormat not implemented for this platform"); + return FORMAT_WINDOWS_EXCEPTIONRECORD32; #endif } |