From: Yunzhong Gao <Yunzhong_Gao@playstation.sony.com>
Date: Wed, 6 Jan 2016 02:48:42 +0000 (+0000)
Subject: Another attempt at fixing the i686-mingw32-RA-on-linux buildbot. I am getting
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bcbe1c3e294ae619f42c31888b0b0cf1c42e5811;p=oota-llvm.git

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 28ffec81dd8..ad48aec73fb 100644
--- 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);