diff options
| author | dim <dim@FreeBSD.org> | 2014-11-24 17:02:24 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-24 17:02:24 +0000 |
| commit | 2c8643c6396b0a3db33430cf9380e70bbb9efce0 (patch) | |
| tree | 4df130b28021d86e13bf4565ef58c1c5a5e093b4 /contrib/llvm/lib/Support/Windows/ThreadLocal.inc | |
| parent | 678318cd20f7db4e6c6b85d83fe00fa327b04fca (diff) | |
| parent | e27feadae0885aa074df58ebfda2e7a7f7a7d590 (diff) | |
| download | FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.zip FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.tar.gz | |
Merge llvm 3.5.0 release from ^/vendor/llvm/dist, resolve conflicts, and
preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/lib/Support/Windows/ThreadLocal.inc')
| -rw-r--r-- | contrib/llvm/lib/Support/Windows/ThreadLocal.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm/lib/Support/Windows/ThreadLocal.inc b/contrib/llvm/lib/Support/Windows/ThreadLocal.inc index 057deb3..14ce619 100644 --- a/contrib/llvm/lib/Support/Windows/ThreadLocal.inc +++ b/contrib/llvm/lib/Support/Windows/ThreadLocal.inc @@ -16,14 +16,14 @@ //=== is guaranteed to work on *all* Win32 variants. //===----------------------------------------------------------------------===// -#include "Windows.h" +#include "WindowsSupport.h" #include "llvm/Support/ThreadLocal.h" namespace llvm { using namespace sys; ThreadLocalImpl::ThreadLocalImpl() : data() { - typedef int SIZE_TOO_BIG[sizeof(DWORD) <= sizeof(data) ? 1 : -1]; + static_assert(sizeof(DWORD) <= sizeof(data), "size too big"); DWORD* tls = reinterpret_cast<DWORD*>(&data); *tls = TlsAlloc(); assert(*tls != TLS_OUT_OF_INDEXES); |
