Merge remote-tracking branch 'origin/1.11' into 1.11

This commit is contained in:
Wojtek Figat
2025-09-09 22:58:34 +02:00
3 changed files with 11 additions and 2 deletions

View File

@@ -258,7 +258,10 @@ bool MacPlatform::Init()
// Get device id
{
io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/");
#if MAC_OS_X_VERSION_MAX_ALLOWED < 120000
#define kIOMainPortDefault kIOMasterPortDefault
#endif
io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMainPortDefault, "IOService:/");
CFStringRef deviceUuid = (CFStringRef)IORegistryEntryCreateCFProperty(ioRegistryRoot, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
IOObjectRelease(ioRegistryRoot);
String uuidStr = AppleUtils::ToString(deviceUuid);