Skip to content

Commit c195942

Browse files
authored
[Mac OS X] Fix sys_ss_random_number_generator & cleanup some dead code (#19382)
1 parent 9bb7e2e commit c195942

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

Utilities/File.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,13 +1224,21 @@ bool fs::is_optical_raw_device(const std::string& path)
12241224
}
12251225

12261226
return false;
1227+
#else
1228+
#ifdef __APPLE__
1229+
// On Mac OS X optical disks will only ever be mounted under /dev/disk(whatever), similar for raw devices,
1230+
// so reject anything not containing the disk string.
1231+
if (!path.starts_with("/dev/disk") && !path.starts_with("/dev/rdisk"))
1232+
{
1233+
return false;
1234+
}
12271235
#else
12281236
// Skip a useless check if the path cannot point to a device node (device nodes always live in "/dev")
12291237
if (!path.starts_with("/dev/"))
12301238
{
12311239
return false;
12321240
}
1233-
1241+
#endif
12341242
struct ::stat file_info;
12351243

12361244
if (::stat(path.c_str(), &file_info) != 0)

rpcs3/rpcs3.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -655,14 +655,6 @@ int run_rpcs3(int argc, char** argv)
655655
}
656656
#endif
657657

658-
#if defined(__APPLE__) && defined(__x86_64__)
659-
if (const utils::OS_version os = utils::get_OS_version();
660-
os.version_major == 14 && os.version_minor < 3 && (utils::get_cpu_brand().rfind("VirtualApple", 0) == 0))
661-
{
662-
report_fatal_error(fmt::format("RPCS3 requires macOS 14.3.0 or later.\nYou're currently using macOS %i.%i.%i.\nPlease update macOS from System Settings.\n\n", os.version_major, os.version_minor, os.version_patch));
663-
}
664-
#endif
665-
666658
ensure(thread_ctrl::is_main(), "Not main thread");
667659

668660
// Initialize thread pool finalizer (on first use)

0 commit comments

Comments
 (0)