X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FLinker.h;h=f40cce3dcd122f15b755b324af1087928e416609;hb=22bca4dfb05b1b8079f08deac5b3cf1a6bc2568b;hp=ea981f565287d5eb08a9e6b787eda9fc7d8b09c8;hpb=1166b00316761df873db882c7212133f9b074d41;p=oota-llvm.git

diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h
index ea981f56528..f40cce3dcd1 100644
--- a/include/llvm/Linker.h
+++ b/include/llvm/Linker.h
@@ -1,11 +1,11 @@
-//===- 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;
@@ -15,6 +15,7 @@ class Module;
 // 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
+