Fix host compiler when cross OS DAC compiling (dotnet#31775)

* Fix duplicate type definition MINIDUMP_TYPE The Windows headers define MINIDUMP_TYPE. Do not define when using a Windows HOST. * Define DLLEXPORT macro as empty on Windows hosts * Prefer HOST_WINDOWS to !HOST_UNIX
Si1ver · Feb 5, 2020 · 0ae4902 · 0ae4902
1 parent c44edc1
commit 0ae4902
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/coreclr/src/debug/inc/dump/dumpcommon.h b/src/coreclr/src/debug/inc/dump/dumpcommon.h
@@ -5,7 +5,7 @@
 #ifndef DEBUGGER_DUMPCOMMON_H
 #define DEBUGGER_DUMPCOMMON_H
 
-#ifdef TARGET_UNIX
+#ifdef HOST_UNIX
 typedef enum _MINIDUMP_TYPE {
     MiniDumpNormal                         = 0x00000000,
     MiniDumpWithDataSegs                   = 0x00000001,
@@ -32,7 +32,7 @@ typedef enum _MINIDUMP_TYPE {
     MiniDumpWithAvxXStateContext           = 0x00200000,
     MiniDumpValidTypeFlags                 = 0x003fffff,
 } MINIDUMP_TYPE;
-#endif // TARGET_UNIX
+#endif // HOST_UNIX
 
 #if defined(DACCESS_COMPILE) || defined(RIGHT_SIDE_COMPILE)
 

diff --git a/src/coreclr/src/inc/crtwrap.h b/src/coreclr/src/inc/crtwrap.h
@@ -21,7 +21,7 @@
 #include <wchar.h>
 #include <stdio.h>
 
-#ifndef TARGET_UNIX
+#ifdef HOST_WINDOWS
 // CoreCLR.dll uses linker .def files to control the exported symbols.
 // Define DLLEXPORT macro as empty on Windows.
 #define DLLEXPORT