diff options
| author | Yunzhong Gao <Yunzhong_Gao@playstation.sony.com> | 2016-01-06 01:36:45 +0000 |
|---|---|---|
| committer | Yunzhong Gao <Yunzhong_Gao@playstation.sony.com> | 2016-01-06 01:36:45 +0000 |
| commit | d7009f31a180e295cfdeb47d134c834c441b44f1 (patch) | |
| tree | 67fadf228ee0410d98cdbe3135c4ac60dd6c4f50 /llvm/lib/Support | |
| parent | a0da6408d6fa12cec861f0680939600b3f1634c2 (diff) | |
| download | bcm5719-llvm-d7009f31a180e295cfdeb47d134c834c441b44f1.tar.gz bcm5719-llvm-d7009f31a180e295cfdeb47d134c834c441b44f1.zip | |
Hopefully fix a mingw32 buildbot (i686-mingw32-RA-on-linux) which does not have
the VersionHelpers.h header.
llvm-svn: 256896
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/Windows/WindowsSupport.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/Support/Windows/WindowsSupport.h b/llvm/lib/Support/Windows/WindowsSupport.h index 5e5163b3493..2e75d1674a3 100644 --- a/llvm/lib/Support/Windows/WindowsSupport.h +++ b/llvm/lib/Support/Windows/WindowsSupport.h @@ -31,7 +31,9 @@ #define _WIN32_IE 0x0800 // MinGW at it again. FIXME: verify if still needed. #define WIN32_LEAN_AND_MEAN #define NOGDI +#ifndef NOMINMAX #define NOMINMAX +#endif #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringExtras.h" @@ -46,10 +48,12 @@ #include <string> #include <vector> -#ifndef __CYGWIN__ +#if !defined(__CYGWIN__) && \ + !(defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) #include <VersionHelpers.h> #else // Cygwin does not have the IsWindows8OrGreater() API. +// Mingw32 does not have the API either (but mingw-w64 does). inline bool IsWindows8OrGreater() { OSVERSIONINFO osvi = {}; osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); |
