Merge branch 'shadps4-emu:main' into main

This commit is contained in:
Xphalnos 2024-06-11 22:10:04 +02:00 committed by GitHub
commit 7599ba1761
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions

View File

@ -47,8 +47,8 @@ u64 PS4_SYSV_ABI sceKernelReadTsc() {
} }
int PS4_SYSV_ABI sceKernelUsleep(u32 microseconds) { int PS4_SYSV_ABI sceKernelUsleep(u32 microseconds) {
#ifdef _WIN64
if (microseconds < 1000u) { if (microseconds < 1000u) {
#if _WIN64
LARGE_INTEGER interval{ LARGE_INTEGER interval{
.QuadPart = -1 * (microseconds * 10u), .QuadPart = -1 * (microseconds * 10u),
}; };
@ -57,7 +57,7 @@ int PS4_SYSV_ABI sceKernelUsleep(u32 microseconds) {
std::this_thread::sleep_for(std::chrono::microseconds(microseconds)); std::this_thread::sleep_for(std::chrono::microseconds(microseconds));
} }
#else #else
usleep(microseconds); usleep(microseconds);
#endif #endif
return 0; return 0;
} }