Skip to content

Commit db9087a

Browse files
committed
[lldb] Clean up uses of UuidCompatibility.h
This commit does a few related things: - Removes unused function `uuid_is_null` - Removes unneeded includes of UuidCompatibility.h - Renames UuidCompatibility to AppleUuidCompatibility and adds a comment to clarify intent of header. - Moves AppleUuidCompatibility to the include directory Differential Revision: https://reviews.llvm.org/D156562
1 parent 96cae81 commit db9087a

File tree

6 files changed

+5
-24
lines changed

6 files changed

+5
-24
lines changed

lldb/source/Utility/UuidCompatibility.h renamed to lldb/include/lldb/Utility/AppleUuidCompatibility.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// Include this header if your system does not have a definition of uuid_t
9+
// Include this header for a definition of uuid_t compatible with Darwin's
10+
// definition.
1011

1112
#ifndef utility_UUID_COMPATIBILITY_H
1213
#define utility_UUID_COMPATIBILITY_H
13-
1414
// uuid_t is guaranteed to always be a 16-byte array
1515
typedef unsigned char uuid_t[16];
16-
17-
// Return 1 if uuid is null, that is, all zeroes.
18-
inline __attribute__((always_inline)) int uuid_is_null(uuid_t uuid) {
19-
for (int i = 0; i < 16; i++)
20-
if (uuid[i])
21-
return 0;
22-
return 1;
23-
}
24-
2516
#endif // utility_UUID_COMPATIBILITY_H

lldb/source/Expression/ObjectFileJIT.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
#include "lldb/Utility/Timer.h"
2626
#include "lldb/Utility/UUID.h"
2727

28-
#ifndef __APPLE__
29-
#include "Utility/UuidCompatibility.h"
30-
#endif
31-
3228
using namespace lldb;
3329
using namespace lldb_private;
3430

lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "lldb/Host/macosx/HostInfoMacOSX.h"
10-
#include "Utility/UuidCompatibility.h"
1110
#include "lldb/Host/FileSystem.h"
1211
#include "lldb/Host/Host.h"
1312
#include "lldb/Host/HostInfo.h"
@@ -32,6 +31,7 @@
3231
#include <sys/sysctl.h>
3332
#include <sys/syslimits.h>
3433
#include <sys/types.h>
34+
#include <uuid/uuid.h>
3535

3636
// Objective-C/C++ includes
3737
#include <CoreFoundation/CoreFoundation.h>

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@
4343
#define DEBUG_PRINTF(fmt, ...)
4444
#endif
4545

46-
#ifndef __APPLE__
47-
#include "Utility/UuidCompatibility.h"
48-
#else
49-
#include <uuid/uuid.h>
50-
#endif
51-
5246
#include <memory>
5347

5448
using namespace lldb;

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#endif
4141

4242
#ifndef __APPLE__
43-
#include "Utility/UuidCompatibility.h"
43+
#include "lldb/Utility/AppleUuidCompatibility.h"
4444
#else
4545
#include <uuid/uuid.h>
4646
#endif

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#endif
6464

6565
#ifndef __APPLE__
66-
#include "Utility/UuidCompatibility.h"
66+
#include "lldb/Utility/AppleUuidCompatibility.h"
6767
#else
6868
#include <uuid/uuid.h>
6969
#endif

0 commit comments

Comments
 (0)