From 75ebce9b55fa10495140bc115db9578ae8cb8ab1 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 14 Feb 2017 01:38:14 +0000 Subject: [PATCH] Undef MemoryFence, which is defined to _mm_mfence by winnt.h git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295014 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Atomic.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/llvm/Support/Atomic.h b/include/llvm/Support/Atomic.h index d03714b009c..552313f0c24 100644 --- a/include/llvm/Support/Atomic.h +++ b/include/llvm/Support/Atomic.h @@ -20,6 +20,11 @@ #include "llvm/Support/DataTypes.h" +// Windows will at times define MemoryFence. +#ifdef MemoryFence +#undef MemoryFence +#endif + namespace llvm { namespace sys { void MemoryFence(); -- 2.50.1