From 49a3b27df895ca714082b539fc7812cda258a6fd Mon Sep 17 00:00:00 2001 From: Eric Beckmann Date: Thu, 20 Jul 2017 23:14:12 +0000 Subject: [PATCH] Only defined CombinedRoot if libxml2 is used. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@308694 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/WindowsManifestMerger.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/llvm/Support/WindowsManifestMerger.h b/include/llvm/Support/WindowsManifestMerger.h index a5d7b1182e3..d69931b53f5 100644 --- a/include/llvm/Support/WindowsManifestMerger.h +++ b/include/llvm/Support/WindowsManifestMerger.h @@ -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; }; -- 2.50.1