diff options
author | Daniel Malea <daniel.malea@intel.com> | 2013-04-17 19:24:22 +0000 |
---|---|---|
committer | Daniel Malea <daniel.malea@intel.com> | 2013-04-17 19:24:22 +0000 |
commit | ffeb4b605a2160993ce11b423098318ed94a84f4 (patch) | |
tree | 5ee27914e571af39207a7703437a429b39143705 | |
parent | 111c4a6b69086773254345c7edd2ce4f439c98d9 (diff) | |
download | bcm5719-llvm-ffeb4b605a2160993ce11b423098318ed94a84f4.tar.gz bcm5719-llvm-ffeb4b605a2160993ce11b423098318ed94a84f4.zip |
Fix build on Linux
- add a workaround header to define uuid_t on platforms that need it
- unbreak remote debugging of mac os x apps
llvm-svn: 179710
3 files changed, 26 insertions, 0 deletions
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index ea8fbd3f029..bef86ae2ffa 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -38,6 +38,10 @@ #define DEBUG_PRINTF(fmt, ...) #endif +#ifndef __APPLE__ +#include "Utility/UuidCompatibility.h" +#endif + using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 4f205e9ec63..49441f45ce9 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -43,6 +43,10 @@ #include <dlfcn.h> #endif +#ifndef __APPLE__ +#include "Utility/UuidCompatibility.h" +#endif + using namespace lldb; using namespace lldb_private; using namespace llvm::MachO; diff --git a/lldb/source/Utility/UuidCompatibility.h b/lldb/source/Utility/UuidCompatibility.h new file mode 100644 index 00000000000..df26f77ab52 --- /dev/null +++ b/lldb/source/Utility/UuidCompatibility.h @@ -0,0 +1,18 @@ +//===-- UuidCompatibility.h -------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// Include this header if your system does not have a definition of uuid_t + +#ifndef utility_UUID_COMPATIBILITY_H +#define utility_UUID_COMPATIBILITY_H + +// uuid_t is guaranteed to always be a 16-byte array +typedef unsigned char uuid_t[16]; + +#endif // utility_UUID_COMPATIBILITY_H |