diff options
| author | Yunzhong Gao <Yunzhong_Gao@playstation.sony.com> | 2016-01-06 02:48:42 +0000 |
|---|---|---|
| committer | Yunzhong Gao <Yunzhong_Gao@playstation.sony.com> | 2016-01-06 02:48:42 +0000 |
| commit | d84c13cdb85235a8eac41df6a51fc6b6de5da8ae (patch) | |
| tree | 0570058c96e9ccf39f93d38a749679a082eb5f7d /llvm/lib/Support | |
| parent | b15585f0ead67fa1959e5aeae03f0e87fc8338f9 (diff) | |
| download | bcm5719-llvm-d84c13cdb85235a8eac41df6a51fc6b6de5da8ae.tar.gz bcm5719-llvm-d84c13cdb85235a8eac41df6a51fc6b6de5da8ae.zip | |
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.
llvm-svn: 256902
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/Windows/WindowsSupport.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/Support/Windows/WindowsSupport.h b/llvm/lib/Support/Windows/WindowsSupport.h index 28ffec81dd8..ad48aec73fb 100644 --- a/llvm/lib/Support/Windows/WindowsSupport.h +++ b/llvm/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); |
