Change over to using the definitions for mach-o types and defines to the

defines that are in "llvm/Support/MachO.h". This should allow ObjectFileMachO
and ObjectContainerUniversalMachO to be able to be cross compiled in Linux.

Also did some cleanup on the ASTType by renaming it to ClangASTType and
renaming the header file. Moved a lot of "AST * + opaque clang type *"
functionality from lldb_private::Type over into ClangASTType.

llvm-svn: 109046

1 files changed, 4 insertions, 6 deletions

diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
index 8a7f975bc67..55a88278d8a 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
@@ -10,11 +10,11 @@
 #ifndef liblldb_ObjectContainerUniversalMachO_h_
 #define liblldb_ObjectContainerUniversalMachO_h_
 
-#include <mach-o/fat.h>
-
 #include "lldb/Symbol/ObjectContainer.h"
 #include "lldb/Core/FileSpec.h"
 
+#include "llvm/Support/MachO.h"
+
 class ObjectContainerUniversalMachO :
     public lldb_private::ObjectContainer
 {
@@ -94,10 +94,8 @@ public:
 
 
 protected:
-    typedef struct fat_header fat_header_t;
-    typedef struct fat_arch fat_arch_t;
-    fat_header_t m_header;
-    std::vector<fat_arch_t> m_fat_archs;
+    llvm::MachO::fat_header m_header;
+    std::vector<llvm::MachO::fat_arch> m_fat_archs;
 };
 
 #endif  // liblldb_ObjectContainerUniversalMachO_h_