3 files changed, 4 insertions, 8 deletions
diff --git a/clang/include/clang/Frontend/InitPreprocessor.h b/clang/include/clang/Frontend/InitPreprocessor.h
index bf27b19aa3d..415acea79a2 100644
--- a/clang/include/clang/Frontend/InitPreprocessor.h
+++ b/clang/include/clang/Frontend/InitPreprocessor.h
@@ -69,9 +69,9 @@ public:
 };
 
 /// InitializePreprocessor - Initialize the preprocessor getting it and the
-/// environment ready to process a single file. This returns true on error.
+/// environment ready to process a single file.
 ///
-bool InitializePreprocessor(Preprocessor &PP,
+void InitializePreprocessor(Preprocessor &PP,
                             const PreprocessorInitOptions& InitOptions);
 
 } // end namespace clang
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index 3a54d1dca78..7139e55f0b6 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -442,7 +442,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
 /// InitializePreprocessor - Initialize the preprocessor getting it and the
 /// environment ready to process a single file. This returns true on error.
 ///
-bool clang::InitializePreprocessor(Preprocessor &PP,
+void clang::InitializePreprocessor(Preprocessor &PP,
                                    const PreprocessorInitOptions &InitOpts) {
   std::vector<char> PredefineBuffer;
 
@@ -488,7 +488,4 @@ bool clang::InitializePreprocessor(Preprocessor &PP,
   // Null terminate PredefinedBuffer and add it.
   PredefineBuffer.push_back(0);
   PP.setPredefines(&PredefineBuffer[0]);
-
-  // Once we've read this, we're done.
-  return false;
 }
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index 66aa19a5d31..95f63704014 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -1251,8 +1251,7 @@ public:
 
     PreprocessorInitOptions InitOpts;
     InitializePreprocessorInitOptions(InitOpts);
-    if (InitializePreprocessor(*PP, InitOpts))
-      return 0;
+    InitializePreprocessor(*PP, InitOpts);
 
     return PP.take();
   }