diff --git a/runtime/platform/unwinding_records.cc b/runtime/platform/unwinding_records.cc index f0c7189e786..1b9c4f6f540 100644 --- a/runtime/platform/unwinding_records.cc +++ b/runtime/platform/unwinding_records.cc @@ -7,14 +7,14 @@ namespace dart { -#if !defined(DART_TARGET_OS_WINDOWS) || \ +#if (!defined(DART_TARGET_OS_WINDOWS) && !defined(DART_HOST_OS_WINDOWS)) || \ (!defined(TARGET_ARCH_X64) && !defined(TARGET_ARCH_ARM64)) intptr_t UnwindingRecordsPlatform::SizeInBytes() { return 0; } -#endif // !defined(DART_TARGET_OS_WINDOWS) ... +#endif // (!defined(DART_TARGET_OS_WINDOWS) && !defined(DART_HOST_OS_WINDOWS)) #if !defined(DART_HOST_OS_WINDOWS) || \ (!defined(TARGET_ARCH_X64) && !defined(TARGET_ARCH_ARM64)) diff --git a/runtime/platform/unwinding_records.h b/runtime/platform/unwinding_records.h index e8a7f88a29b..8eab924da31 100644 --- a/runtime/platform/unwinding_records.h +++ b/runtime/platform/unwinding_records.h @@ -26,7 +26,8 @@ class UnwindingRecordsPlatform : public AllStatic { static void* GetDeleteGrowableFunctionTableFunc(); }; -#if defined(DART_TARGET_OS_WINDOWS) && defined(TARGET_ARCH_X64) +#if (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \ + defined(TARGET_ARCH_X64) #pragma pack(push, 1) // @@ -104,7 +105,8 @@ struct CodeRangeUnwindingRecord { #pragma pack(pop) -#elif defined(DART_TARGET_OS_WINDOWS) && defined(TARGET_ARCH_ARM64) +#elif (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \ + defined(TARGET_ARCH_ARM64) #pragma pack(push, 1) @@ -237,7 +239,7 @@ struct CodeRangeUnwindingRecord { #pragma pack(pop) -#endif // defined(DART_TARGET_OS_WINDOWS) && defined(TARGET_ARCH_X64) +#endif // (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) } // namespace dart diff --git a/runtime/platform/unwinding_records_win.cc b/runtime/platform/unwinding_records_win.cc index 466968ffe01..ade1986eb3c 100644 --- a/runtime/platform/unwinding_records_win.cc +++ b/runtime/platform/unwinding_records_win.cc @@ -9,7 +9,7 @@ namespace dart { -#if defined(DART_TARGET_OS_WINDOWS) && \ +#if (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \ (defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64)) #if defined(TARGET_ARCH_X64) @@ -22,7 +22,7 @@ intptr_t UnwindingRecordsPlatform::SizeInBytes() { return kReservedUnwindingRecordsSizeBytes; } -#endif // defined(DART_TARGET_OS_WINDOWS) +#endif // defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS) #if defined(DART_HOST_OS_WINDOWS) && \ (defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64)) diff --git a/runtime/vm/unwinding_records.cc b/runtime/vm/unwinding_records.cc index 0514e33bd17..9ef2451a2be 100644 --- a/runtime/vm/unwinding_records.cc +++ b/runtime/vm/unwinding_records.cc @@ -7,7 +7,7 @@ namespace dart { -#if !defined(DART_TARGET_OS_WINDOWS) || \ +#if (!defined(DART_TARGET_OS_WINDOWS) && !defined(DART_HOST_OS_WINDOWS)) || \ (!defined(TARGET_ARCH_X64) && !defined(TARGET_ARCH_ARM64)) const void* UnwindingRecords::GenerateRecordsInto(intptr_t offset, diff --git a/runtime/vm/unwinding_records_win.cc b/runtime/vm/unwinding_records_win.cc index 385c6084b13..84aebe36387 100644 --- a/runtime/vm/unwinding_records_win.cc +++ b/runtime/vm/unwinding_records_win.cc @@ -10,7 +10,7 @@ namespace dart { -#if defined(DART_TARGET_OS_WINDOWS) && \ +#if (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) && \ (defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64)) static void InitUnwindingRecord(intptr_t offset, @@ -101,7 +101,7 @@ const void* UnwindingRecords::GenerateRecordsInto(intptr_t offset, return target_buffer; } -#endif // defined(DART_TARGET_OS_WINDOWS) +#endif // (defined(DART_TARGET_OS_WINDOWS) || defined(DART_HOST_OS_WINDOWS)) #if defined(DART_HOST_OS_WINDOWS) && \ (defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64))