diff options
| author | dim <dim@FreeBSD.org> | 2016-01-06 20:19:13 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-06 20:19:13 +0000 |
| commit | e06c171d67ab436f270b15f7e364a8d8f77c01f2 (patch) | |
| tree | b7c03c042b220d85a294b0e2e89936b631d3e6ad /contrib/llvm/lib/Support/Windows/WindowsSupport.h | |
| parent | db873d7452584205dd063528dc8addbf28aa396b (diff) | |
| parent | ff2ba393a56d9d99dcb76ceada542233db28af9a (diff) | |
| download | FreeBSD-src-e06c171d67ab436f270b15f7e364a8d8f77c01f2.zip FreeBSD-src-e06c171d67ab436f270b15f7e364a8d8f77c01f2.tar.gz | |
Update llvm to trunk r256945.
Diffstat (limited to 'contrib/llvm/lib/Support/Windows/WindowsSupport.h')
| -rw-r--r-- | contrib/llvm/lib/Support/Windows/WindowsSupport.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/contrib/llvm/lib/Support/Windows/WindowsSupport.h b/contrib/llvm/lib/Support/Windows/WindowsSupport.h index 34d961b..c65e314 100644 --- a/contrib/llvm/lib/Support/Windows/WindowsSupport.h +++ b/contrib/llvm/lib/Support/Windows/WindowsSupport.h @@ -30,6 +30,9 @@ #define _WIN32_WINNT 0x0601 #define _WIN32_IE 0x0800 // MinGW at it again. FIXME: verify if still needed. #define WIN32_LEAN_AND_MEAN +#ifndef NOMINMAX +#define NOMINMAX +#endif #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringExtras.h" @@ -44,6 +47,21 @@ #include <string> #include <vector> +#if !defined(__CYGWIN__) && !defined(__MINGW32__) +#include <VersionHelpers.h> +#else +// Cygwin does not have the IsWindows8OrGreater() API. +// Some version of mingw does not have the API either. +inline bool IsWindows8OrGreater() { + OSVERSIONINFO osvi = {}; + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if (!::GetVersionEx(&osvi)) + return false; + return (osvi.dwMajorVersion > 6 || + (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion >= 2)); +} +#endif // __CYGWIN__ + inline bool MakeErrMsg(std::string* ErrMsg, const std::string& prefix) { if (!ErrMsg) return true; |
