From 712e8d29c4a52abded4414f673b51dd53dd018f1 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Sun, 29 Apr 2018 00:45:03 +0000 Subject: s/LLVM_ON_WIN32/_WIN32/, llvm LLVM_ON_WIN32 is set exactly with MSVC and MinGW (but not Cygwin) in HandleLLVMOptions.cmake, which is where _WIN32 defined too. Just use the default macro instead of a reinvented one. See thread "Replacing LLVM_ON_WIN32 with just _WIN32" on llvm-dev and cfe-dev. No intended behavior change. This moves over all uses of the macro, but doesn't remove the definition of it in (llvm-)config.h yet. llvm-svn: 331127 --- llvm/lib/Support/Locale.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Support/Locale.cpp') diff --git a/llvm/lib/Support/Locale.cpp b/llvm/lib/Support/Locale.cpp index e24a28be430..19e9ca92579 100644 --- a/llvm/lib/Support/Locale.cpp +++ b/llvm/lib/Support/Locale.cpp @@ -8,7 +8,7 @@ namespace sys { namespace locale { int columnWidth(StringRef Text) { -#if LLVM_ON_WIN32 +#if _WIN32 return Text.size(); #else return llvm::sys::unicode::columnWidthUTF8(Text); @@ -16,7 +16,7 @@ int columnWidth(StringRef Text) { } bool isPrint(int UCS) { -#if LLVM_ON_WIN32 +#if _WIN32 // Restrict characters that we'll try to print to the lower part of ASCII // except for the control characters (0x20 - 0x7E). In general one can not // reliably output code points U+0080 and higher using narrow character C/C++ -- cgit v1.2.3