[llvm] r308694 - Only defined CombinedRoot if libxml2 is used.

[Eric Beckmann via llvm-commits]

Author: ecbeckmann
Date: Thu Jul 20 16:14:12 2017
New Revision: 308694

URL: http://llvm.org/viewvc/llvm-project?rev=308694&view=rev
Log:
Only defined CombinedRoot if libxml2 is used.

Modified:
    llvm/trunk/include/llvm/Support/WindowsManifestMerger.h

Modified: llvm/trunk/include/llvm/Support/WindowsManifestMerger.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/WindowsManifestMerger.h?rev=308694&r1=308693&r2=308694&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/WindowsManifestMerger.h (original)
+++ llvm/trunk/include/llvm/Support/WindowsManifestMerger.h Thu Jul 20 16:14:12 2017
@@ -67,7 +67,9 @@ private:
   static void errorCallback(void *Ctx, const char *Format, ...);
   Error getParseError();
 
+#if LLVM_LIBXML2_ENABLED
   XMLNodeImpl CombinedRoot = nullptr;
+#endif
   bool ParseErrorOccurred = false;
 };