commit 0dfbf6b6085bff1e0d77c16274a0e44fda314047
author Sven van Haastregt <sven.vanhaastregt@arm.com> Thu Aug 23 09:42:58 2018 +0000
committer Sven van Haastregt <sven.vanhaastregt@arm.com> Thu Aug 23 09:42:58 2018 +0000
tree 2f089bfa3028a41f8ebe246447378f20b6ee39ac
parent 6bcf2ba2f0fff179602fd60b5e0127cd20fc907e

[Support] Fix some Wundef warnings

For the _WIN32 macro, it is the definedness that matters rather than
the value.  Most uses of the macro already rely on the definedness.
This commit fixes the few remaining uses that relied on the value.

Differential Revision: https://reviews.llvm.org/D51105

llvm-svn: 340520

llvm/lib/Support/COM.cpp

diff --git a/llvm/lib/Support/COM.cpp b/llvm/lib/Support/COM.cpp
index 2e3ff66..97cd085 100644
--- a/llvm/lib/Support/COM.cpp
+++ b/llvm/lib/Support/COM.cpp
@@ -18,6 +18,6 @@
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX
 #include "Unix/COM.inc"
-#elif _WIN32
+#elif defined(_WIN32)
 #include "Windows/COM.inc"
 #endif

llvm/lib/Support/CodeGenCoverage.cpp

diff --git a/llvm/lib/Support/CodeGenCoverage.cpp b/llvm/lib/Support/CodeGenCoverage.cpp
index f0a53db..811020e 100644
--- a/llvm/lib/Support/CodeGenCoverage.cpp
+++ b/llvm/lib/Support/CodeGenCoverage.cpp
@@ -22,7 +22,7 @@
 
 #if LLVM_ON_UNIX
 #include <unistd.h>
-#elif _WIN32
+#elif defined(_WIN32)
 #include <windows.h>
 #endif
 
@@ -93,7 +93,7 @@
     std::string Pid =
 #if LLVM_ON_UNIX
         llvm::to_string(::getpid());
-#elif _WIN32
+#elif defined(_WIN32)
         llvm::to_string(::GetCurrentProcessId());
 #else
         "";

llvm/lib/Support/Locale.cpp

diff --git a/llvm/lib/Support/Locale.cpp b/llvm/lib/Support/Locale.cpp
index e57d377..c4cfc5e 100644
--- a/llvm/lib/Support/Locale.cpp
+++ b/llvm/lib/Support/Locale.cpp
@@ -7,7 +7,7 @@
 namespace locale {
 
 int columnWidth(StringRef Text) {
-#if _WIN32
+#ifdef _WIN32
   return Text.size();
 #else
   return llvm::sys::unicode::columnWidthUTF8(Text);
@@ -15,7 +15,7 @@
 }
 
 bool isPrint(int UCS) {
-#if _WIN32
+#ifdef _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++

llvm/lib/Support/LockFileManager.cpp

diff --git a/llvm/lib/Support/LockFileManager.cpp b/llvm/lib/Support/LockFileManager.cpp
index 77baf7a..c166230 100644
--- a/llvm/lib/Support/LockFileManager.cpp
+++ b/llvm/lib/Support/LockFileManager.cpp
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <system_error>
 #include <tuple>
-#if _WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 #if LLVM_ON_UNIX
@@ -295,7 +295,7 @@
   if (getState() != LFS_Shared)
     return Res_Success;
 
-#if _WIN32
+#ifdef _WIN32
   unsigned long Interval = 1;
 #else
   struct timespec Interval;
@@ -310,7 +310,7 @@
     // finish up and remove the lock file.
     // FIXME: Should we hook in to system APIs to get a notification when the
     // lock file is deleted?
-#if _WIN32
+#ifdef _WIN32
     Sleep(Interval);
 #else
     nanosleep(&Interval, nullptr);
@@ -329,7 +329,7 @@
       return Res_OwnerDied;
 
     // Exponentially increase the time we wait for the lock to be removed.
-#if _WIN32
+#ifdef _WIN32
     Interval *= 2;
 #else
     Interval.tv_sec *= 2;
@@ -340,7 +340,7 @@
     }
 #endif
   } while (
-#if _WIN32
+#ifdef _WIN32
            Interval < MaxSeconds * 1000
 #else
            Interval.tv_sec < (time_t)MaxSeconds