From 23b1d28e690c0e7b67453445ea65b6ce3e4603c4 Mon Sep 17 00:00:00 2001
From: Jeff Cohen <jeffc@jolt-lang.org>
Date: Sun, 25 Sep 2005 19:04:43 +0000
Subject: [PATCH] Fix VC++ build errors.

llvm-svn: 23431
---
 llvm/utils/TableGen/DAGISelEmitter.cpp | 2 ++
 llvm/win32/CodeGen/CodeGen.vcproj      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/llvm/utils/TableGen/DAGISelEmitter.cpp b/llvm/utils/TableGen/DAGISelEmitter.cpp
index d5153caa2e02..ae38830a9d17 100644
--- a/llvm/utils/TableGen/DAGISelEmitter.cpp
+++ b/llvm/utils/TableGen/DAGISelEmitter.cpp
@@ -15,6 +15,7 @@
 #include "Record.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Debug.h"
+#include <algorithm>
 #include <set>
 using namespace llvm;
 
@@ -1128,6 +1129,7 @@ CodeGenPatternResult(TreePatternNode *N, unsigned &Ctr,
   } else {
     N->dump();
     assert(0 && "Unknown node in result pattern!");
+    return ~0U;
   }
 }
 
diff --git a/llvm/win32/CodeGen/CodeGen.vcproj b/llvm/win32/CodeGen/CodeGen.vcproj
index fb2c37e123db..ac39ecfb0105 100644
--- a/llvm/win32/CodeGen/CodeGen.vcproj
+++ b/llvm/win32/CodeGen/CodeGen.vcproj
@@ -212,10 +212,10 @@
 				RelativePath="..\..\include\llvm\CodeGen\IntrinsicLowering.h">
 			</File>
 			<File
-				RelativePath="..\..\lib\CodeGen\LiveInterval.h">
+				RelativePath="..\..\include\llvm\CodeGen\LiveInterval.h">
 			</File>
 			<File
-				RelativePath="..\..\lib\CodeGen\LiveIntervalAnalysis.h">
+				RelativePath="..\..\include\llvm\CodeGen\LiveIntervalAnalysis.h">
 			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\LiveVariables.h">