diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-24 19:48:47 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-24 19:48:47 +0000 |
| commit | ded5f66813de5d400792ef53240addd91049ef79 (patch) | |
| tree | 8b0d9ed139f34f2c56014e205a172ccbb9c23d59 /llvm/lib/CodeGen/SelectionDAG | |
| parent | 4ed214a1915fa713d408d991b63c2827d3731edf (diff) | |
| download | bcm5719-llvm-ded5f66813de5d400792ef53240addd91049ef79.tar.gz bcm5719-llvm-ded5f66813de5d400792ef53240addd91049ef79.zip | |
Get rid of pop_macro warnings on MSVC.
llvm-svn: 114750
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index f3bc50d490e..d971db54d3d 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -3970,9 +3970,11 @@ SelectionDAGBuilder::EmitFuncArgumentDbgValue(const Value *V, MDNode *Variable, } // VisualStudio defines setjmp as _setjmp -#if defined(_MSC_VER) && defined(setjmp) -#define setjmp_undefined_for_visual_studio -#undef setjmp +#if defined(_MSC_VER) && defined(setjmp) && \ + !defined(setjmp_undefined_for_msvc) +# pragma push_macro("setjmp") +# undef setjmp +# define setjmp_undefined_for_msvc #endif /// visitIntrinsicCall - Lower the call to the specified intrinsic function. If |
