diff options
| author | Yunzhong Gao <Yunzhong_Gao@playstation.sony.com> | 2016-01-06 02:32:31 +0000 |
|---|---|---|
| committer | Yunzhong Gao <Yunzhong_Gao@playstation.sony.com> | 2016-01-06 02:32:31 +0000 |
| commit | b15585f0ead67fa1959e5aeae03f0e87fc8338f9 (patch) | |
| tree | 5d6b1a0dea8ade9329988cd620d75310c10d79fd /llvm/lib/Support | |
| parent | 80eb76abf472e7b31d46f1bf364a594304357cb1 (diff) | |
| download | bcm5719-llvm-b15585f0ead67fa1959e5aeae03f0e87fc8338f9.tar.gz bcm5719-llvm-b15585f0ead67fa1959e5aeae03f0e87fc8338f9.zip | |
Another attempt at fixing the i686-mingw32-RA-on-linux buildbot.
llvm-svn: 256901
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/Windows/WindowsSupport.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Support/Windows/WindowsSupport.h b/llvm/lib/Support/Windows/WindowsSupport.h index 2e75d1674a3..28ffec81dd8 100644 --- a/llvm/lib/Support/Windows/WindowsSupport.h +++ b/llvm/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); |
