Expand the pass to unify all of the unwind blocks as well

[oota-llvm.git] / include / llvm / Linker.h

diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h
index 3650ccbadfb0b6bfe395c2aa005e81d936eb1ef0..dac0f9b90e73f500389a7d71f73f98aec102f1fe 100644 (file)
--- a/include/llvm/Linker.h
+++ b/include/llvm/Linker.h
@@ -1,22 +1,21 @@
-//===- llvm/Transforms/Linker.h - Module Linker Interface --------*- C++ -*--=//
+//===- llvm/Transforms/Utils/Linker.h - Module Linker Interface --*- C++ -*--=//
 //
 // This file defines the interface to the module linker.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TRANSFORMATIONS_LINKER_H
-#define LLVM_TRANSFORMATIONS_LINKER_H
+#ifndef LLVM_TRANSFORMATIONS_UTILS_LINKER_H
+#define LLVM_TRANSFORMATIONS_UTILS_LINKER_H
 
 #include <string>
 class Module;
 
-
 // LinkModules - This function links two modules together, with the resulting
 // left module modified to be the composite of the two input modules.  If an
 // error occurs, true is returned and ErrorMsg (if not null) is set to indicate
 // the problem.
 //
-bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg = 0);
+bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg = 0);
 
 #endif