[llvm] r256901 - Another attempt at fixing the i686-mingw32-RA-on-linux buildbot.

[Yunzhong Gao via llvm-commits]

Author: ygao
Date: Tue Jan  5 20:32:31 2016
New Revision: 256901

URL: http://llvm.org/viewvc/llvm-project?rev=256901&view=rev
Log:
Another attempt at fixing the i686-mingw32-RA-on-linux buildbot.


Modified:
    llvm/trunk/lib/Support/Windows/WindowsSupport.h

Modified: llvm/trunk/lib/Support/Windows/WindowsSupport.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/WindowsSupport.h?rev=256901&r1=256900&r2=256901&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/WindowsSupport.h (original)
+++ llvm/trunk/lib/Support/Windows/WindowsSupport.h Tue Jan  5 20:32:31 2016
@@ -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);