diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2016-06-02 18:42:23 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2016-06-02 18:42:23 +0000 |
| commit | d6c5bc2c814e8b677c474499b1715f1a4ea2c8c2 (patch) | |
| tree | 1f0f54358191e8050f597544efb8286cbf357224 /llvm/lib/Support/Threading.cpp | |
| parent | 50451d49fcc9dee4987182fadea967a2a4688a30 (diff) | |
| download | bcm5719-llvm-d6c5bc2c814e8b677c474499b1715f1a4ea2c8c2.tar.gz bcm5719-llvm-d6c5bc2c814e8b677c474499b1715f1a4ea2c8c2.zip | |
Fix the use of sys::MemoryFence after including WindowsSupport.h that
r271558 introduced.
llvm-svn: 271563
Diffstat (limited to 'llvm/lib/Support/Threading.cpp')
| -rw-r--r-- | llvm/lib/Support/Threading.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp index a4e1e44261b..de2ff6b4fae 100644 --- a/llvm/lib/Support/Threading.cpp +++ b/llvm/lib/Support/Threading.cpp @@ -72,6 +72,11 @@ void llvm::llvm_execute_on_thread(void (*Fn)(void*), void *UserData, #include "Windows/WindowsSupport.h" #include <process.h> +// Windows will at times define MemoryFence. +#ifdef MemoryFence +#undef MemoryFence +#endif + struct ThreadInfo { void (*func)(void*); void *param; |
