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

[Yunzhong Gao via llvm-commits]

Author: ygao
Date: Tue Jan  5 20:48:42 2016
New Revision: 256902

URL: http://llvm.org/viewvc/llvm-project?rev=256902&view=rev
Log:
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.


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=256902&r1=256901&r2=256902&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/WindowsSupport.h (original)
+++ llvm/trunk/lib/Support/Windows/WindowsSupport.h Tue Jan  5 20:48:42 2016
@@ -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);