From: Eric Beckmann <ecbeckmann@google.com>
Date: Thu, 14 Sep 2017 23:01:13 +0000 (+0000)
Subject: Fix bug 34608 by moving private header out of public header.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa58033db5bbbcc8d0a9b39b4cc141557cb50a15;p=llvm

Fix bug 34608 by moving private header out of public header.

WindowsManifestMerger.h should not include llvm/Config/config.h, since it is private.  The include has been moved to the source instead.

Summary:
The checksums had already been placed in the IR, this patch allows
MCCodeView to actually write it out to an MCStreamer.

Move private config.h header dependency out of public header file.

Addresses Bug 34608

Subscribers: javed.absar, hiraditya, llvm-commits

Differential Revision: https://reviews.llvm.org/D37863

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313312 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/WindowsManifest/WindowsManifestMerger.h b/include/llvm/WindowsManifest/WindowsManifestMerger.h
index ba5703c673f..302d3705887 100644
--- a/include/llvm/WindowsManifest/WindowsManifestMerger.h
+++ b/include/llvm/WindowsManifest/WindowsManifestMerger.h
@@ -26,7 +26,6 @@
 #ifndef LLVM_INCLUDE_LLVM_SUPPORT_WINDOWS_MANIFEST_MERGER_H
 #define LLVM_INCLUDE_LLVM_SUPPORT_WINDOWS_MANIFEST_MERGER_H
 
-#include "llvm/Config/config.h"
 #include "llvm/Support/Error.h"
 
 namespace llvm {
diff --git a/lib/WindowsManifest/WindowsManifestMerger.cpp b/lib/WindowsManifest/WindowsManifestMerger.cpp
index f2f2187bbac..0a8abed230d 100644
--- a/lib/WindowsManifest/WindowsManifestMerger.cpp
+++ b/lib/WindowsManifest/WindowsManifestMerger.cpp
@@ -12,6 +12,7 @@
 //===---------------------------------------------------------------------===//
 
 #include "llvm/WindowsManifest/WindowsManifestMerger.h"
+#include "llvm/Config/config.h"
 #include "llvm/Support/MemoryBuffer.h"
 
 #include <map>