[PATCH] D37863: 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.

[Eric Beckmann via Phabricator via llvm-commits]

ecbeckmann updated this revision to Diff 115310.
ecbeckmann added a comment.

Put synonymous header first.


https://reviews.llvm.org/D37863

Files:
  llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h
  llvm/lib/WindowsManifest/WindowsManifestMerger.cpp


Index: llvm/lib/WindowsManifest/WindowsManifestMerger.cpp
===================================================================
--- llvm/lib/WindowsManifest/WindowsManifestMerger.cpp
+++ llvm/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>
Index: llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h
===================================================================
--- llvm/include/llvm/WindowsManifest/WindowsManifestMerger.h
+++ llvm/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 {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D37863.115310.patch
Type: text/x-patch
Size: 970 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170914/dd8783f6/attachment.bin>