From 5d679fc502c78eba4758d034cdffc44bc6d48efb Mon Sep 17 00:00:00 2001 From: Caitlyn Cano Date: Fri, 23 Jul 2021 20:39:09 +0000 Subject: [PATCH] [libc] Clean up Windows macros This clean-up removes checks for _WIN64, as the _WIN32 macro returns 1 whenever the compilation targe is 32- or 64-bit ARM. Reviewed By: aeubanks Differential Revision: https://reviews.llvm.org/D106706 --- libc/utils/FPUtil/PlatformDefs.h | 2 +- libc/utils/FPUtil/TestHelpers.cpp | 2 +- libc/utils/UnitTest/PlatformDefs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libc/utils/FPUtil/PlatformDefs.h b/libc/utils/FPUtil/PlatformDefs.h index 30ed24d..274800a 100644 --- a/libc/utils/FPUtil/PlatformDefs.h +++ b/libc/utils/FPUtil/PlatformDefs.h @@ -13,7 +13,7 @@ #define X87_FPU #endif -#if defined(_WIN32) || defined(_WIN64) +#if defined(_WIN32) #define LONG_DOUBLE_IS_DOUBLE #endif diff --git a/libc/utils/FPUtil/TestHelpers.cpp b/libc/utils/FPUtil/TestHelpers.cpp index cdc8745..21053c8 100644 --- a/libc/utils/FPUtil/TestHelpers.cpp +++ b/libc/utils/FPUtil/TestHelpers.cpp @@ -74,7 +74,7 @@ template void describeValue(const char *, double, template void describeValue(const char *, long double, testutils::StreamWrapper &); -#if defined(_WIN32) || defined(_WIN64) +#if defined(_WIN32) #define sigjmp_buf jmp_buf #define sigsetjmp(buf, save) setjmp(buf) #define siglongjmp(buf, val) longjmp(buf, val) diff --git a/libc/utils/UnitTest/PlatformDefs.h b/libc/utils/UnitTest/PlatformDefs.h index 319b73e..40472f4 100644 --- a/libc/utils/UnitTest/PlatformDefs.h +++ b/libc/utils/UnitTest/PlatformDefs.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_UTILS_UNITTEST_PLATFORMDEFS_H #define LLVM_LIBC_UTILS_UNITTEST_PLATFORMDEFS_H -#if !(defined(_WIN32) || defined(_WIN64)) +#if !defined(_WIN32) #define ENABLE_SUBPROCESS_TESTS #endif -- 2.7.4