Another attempt at fixing the i686-mingw32-RA-on-linux buildbot. I am getting

confused with what version of mingw is actually installed on the buildbot, and
for now I will just assume this is an unknown version which does not ship with
VersionHelpers.h.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256902 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/Windows/WindowsSupport.h b/lib/Support/Windows/WindowsSupport.h
index 28ffec81dd869ca8081f04d53ffacbc8111a28ae..ad48aec73fb670f240876e65dfa0d6b7965b5528 100644 (file)
--- a/lib/Support/Windows/WindowsSupport.h
+++ b/lib/Support/Windows/WindowsSupport.h
@@ -48,13 +48,11 @@
 #include <string>
 #include <vector>
 
-#if !defined(__CYGWIN__) && \
-    !(defined(__MINGW32__) && defined(__MINGW64_VERSION_MAJOR) && \
-      __MINGW64_VERSION_MAJOR < 3)
+#if !defined(__CYGWIN__) && !defined(__MINGW32__)
 #include <VersionHelpers.h>
 #else
 // Cygwin does not have the IsWindows8OrGreater() API.
-// Older version of mingw-w64 does not have the API either.
+// Some version of mingw does not have the API either.
 inline bool IsWindows8OrGreater() {
   OSVERSIONINFO osvi = {};
   osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);