From c6a47e8a7950b4e05532e0718abedcc635ce9cf2 Mon Sep 17 00:00:00 2001
From: Chuck Rose III <cfr@adobe.com>
Date: Tue, 15 Apr 2008 21:27:11 +0000
Subject: [PATCH] VisualStudio project files updated.  #include <algorithm>
 added to make VisualStudio happy.  Also had to undefine setjmp because of
 #include <csetjmp> turning setjmp into _setjmp in VisualStudio.

llvm-svn: 49743
---
 llvm/lib/Transforms/Utils/LowerInvoke.cpp   | 15 +++++++++++++++
 llvm/utils/TableGen/RegisterInfoEmitter.cpp |  1 +
 llvm/win32/Transforms/Transforms.vcproj     |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/llvm/lib/Transforms/Utils/LowerInvoke.cpp b/llvm/lib/Transforms/Utils/LowerInvoke.cpp
index 884f4fce9196..3d356b78aeea 100644
--- a/llvm/lib/Transforms/Utils/LowerInvoke.cpp
+++ b/llvm/lib/Transforms/Utils/LowerInvoke.cpp
@@ -143,7 +143,22 @@ bool LowerInvoke::doInitialization(Module &M) {
                                       Constant::getNullValue(PtrJBList),
                                       "llvm.sjljeh.jblist", &M);
     }
+
+// VisualStudio defines setjmp as _setjmp via #include <csetjmp> / <setjmp.h>, 
+// so it looks like Intrinsic::_setjmp
+#if defined(_MSC_VER) && defined(setjmp)
+#define setjmp_undefined_for_visual_studio
+#undef setjmp
+#endif
+
     SetJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::setjmp);
+
+#if defined(_MSC_VER) && defined(setjmp_undefined_for_visual_studio)
+// let's return it to _setjmp state in case anyone ever needs it after this 
+// point under VisualStudio
+#define setjmp _setjmp 
+#endif
+
     LongJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::longjmp);
   }
 
diff --git a/llvm/utils/TableGen/RegisterInfoEmitter.cpp b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
index ce95390054f8..b9253cfd3e84 100644
--- a/llvm/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
@@ -21,6 +21,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Streams.h"
 #include <set>
+#include <algorithm>
 using namespace llvm;
 
 // runEnums - Print out enum values for all of the registers.
diff --git a/llvm/win32/Transforms/Transforms.vcproj b/llvm/win32/Transforms/Transforms.vcproj
index 2decde367d56..56de59e54dad 100644
--- a/llvm/win32/Transforms/Transforms.vcproj
+++ b/llvm/win32/Transforms/Transforms.vcproj
@@ -487,6 +487,10 @@
 					RelativePath="..\..\lib\Transforms\Scalar\LoopUnswitch.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Scalar\MemCpyOptimizer.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\PredicateSimplifier.cpp"
 					>