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

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



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

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