bulbazord updated this revision to Diff 545289.
bulbazord added a comment.
Fix incorrect includes that @jasonmolenda pointed out
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D156562/new/
https://reviews.llvm.org/D156562
Files:
lldb/include/lldb/Utility/AppleUuidCompatibility.h
lldb/source/Expression/ObjectFileJIT.cpp
lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
lldb/source/Utility/UuidCompatibility.h
Index: lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
===================================================================
--- lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -63,7 +63,7 @@
#endif
#ifndef __APPLE__
-#include "Utility/UuidCompatibility.h"
+#include "lldb/Utility/AppleUuidCompatibility.h"
#else
#include <uuid/uuid.h>
#endif
Index: lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
===================================================================
--- lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
+++ lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
@@ -40,7 +40,7 @@
#endif
#ifndef __APPLE__
-#include "Utility/UuidCompatibility.h"
+#include "lldb/Utility/AppleUuidCompatibility.h"
#else
#include <uuid/uuid.h>
#endif
Index: lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
===================================================================
--- lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
+++ lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
@@ -43,12 +43,6 @@
#define DEBUG_PRINTF(fmt, ...)
#endif
-#ifndef __APPLE__
-#include "Utility/UuidCompatibility.h"
-#else
-#include <uuid/uuid.h>
-#endif
-
#include <memory>
using namespace lldb;
Index: lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
===================================================================
--- lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
+++ lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "lldb/Host/macosx/HostInfoMacOSX.h"
-#include "Utility/UuidCompatibility.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/Host.h"
#include "lldb/Host/HostInfo.h"
@@ -32,6 +31,7 @@
#include <sys/sysctl.h>
#include <sys/syslimits.h>
#include <sys/types.h>
+#include <uuid/uuid.h>
// Objective-C/C++ includes
#include <CoreFoundation/CoreFoundation.h>
Index: lldb/source/Expression/ObjectFileJIT.cpp
===================================================================
--- lldb/source/Expression/ObjectFileJIT.cpp
+++ lldb/source/Expression/ObjectFileJIT.cpp
@@ -25,10 +25,6 @@
#include "lldb/Utility/Timer.h"
#include "lldb/Utility/UUID.h"
-#ifndef __APPLE__
-#include "Utility/UuidCompatibility.h"
-#endif
-
using namespace lldb;
using namespace lldb_private;
Index: lldb/include/lldb/Utility/AppleUuidCompatibility.h
===================================================================
--- lldb/include/lldb/Utility/AppleUuidCompatibility.h
+++ lldb/include/lldb/Utility/AppleUuidCompatibility.h
@@ -6,20 +6,11 @@
//
//===----------------------------------------------------------------------===//
-// Include this header if your system does not have a definition of uuid_t
+// Include this header for a definition of uuid_t compatible with Darwin's
+// definition.
#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];
-
-// Return 1 if uuid is null, that is, all zeroes.
-inline __attribute__((always_inline)) int uuid_is_null(uuid_t uuid) {
- for (int i = 0; i < 16; i++)
- if (uuid[i])
- return 0;
- return 1;
-}
-
#endif // utility_UUID_COMPATIBILITY_H
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
