summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-05-11 06:17:44 +0000
committerDouglas Gregor <dgregor@apple.com>2010-05-11 06:17:44 +0000
commit6739a891173474b3f295234b2a55c65d7f05e868 (patch)
treec782e759e5291476ba6572f45ef19ba3ca551973 /llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
parentea31737fefd6d8bbbc54573e6b3957c1a64dc65d (diff)
downloadbcm5719-llvm-6739a891173474b3f295234b2a55c65d7f05e868.tar.gz
bcm5719-llvm-6739a891173474b3f295234b2a55c65d7f05e868.zip
Fixes for Microsoft Visual Studio 2010, from Steven Watanabe!
llvm-svn: 103457
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 1d87e79aa84..695b7913b48 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3726,6 +3726,12 @@ SelectionDAGBuilder::EmitFuncArgumentDbgValue(const DbgValueInst &DI,
return true;
}
+// VisualStudio defines setjmp as _setjmp
+#if defined(_MSC_VER) && defined(setjmp)
+#define setjmp_undefined_for_visual_studio
+#undef setjmp
+#endif
+
/// visitIntrinsicCall - Lower the call to the specified intrinsic function. If
/// we want to emit this as a call to a named external function, return the name
/// otherwise lower it and return null.
OpenPOWER on IntegriCloud