From 280c2cc2b747f4a5e21ec69509c37ab26875aaf9 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sat, 23 Jun 2018 09:09:19 +0100
Subject: [PATCH] [dsymutil] Avoid headers with block declarations.

---
 llvm/tools/dsymutil/CFBundle.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/llvm/tools/dsymutil/CFBundle.cpp b/llvm/tools/dsymutil/CFBundle.cpp
index 15ee8011a4a..c76375798b8 100644
--- a/llvm/tools/dsymutil/CFBundle.cpp
+++ b/llvm/tools/dsymutil/CFBundle.cpp
@@ -13,7 +13,9 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
-#include <CoreFoundation/CoreFoundation.h>
+//#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFString.h>
+#include <CoreFoundation/CFBundle.h>
 #include <assert.h>
 #include <glob.h>
 #include <memory>