Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Coding style issues fixes

Browse source 
Thanks @Megamouse
This commit is contained in:
DH 2025-03-01 01:02:01 +03:00 • committed by Megamouse
parent 976b0a8f1d
commit 95d0cb18e4
10 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utilities/File.cpp
View file

@ -1693,7 +1693,8 @@ fs::file fs::file::from_native_handle(void *handle)
return result;
}
#else
fs::file fs::file::from_native_handle(int fd) {
fs::file fs::file::from_native_handle(int fd)
{
fs::file result;
result.m_file = std::make_unique<unix_file>(fd);
return result;

13
Utilities/Thread.cpp
View file

@ -2172,8 +2172,8 @@ void thread_base::start()
void thread_base::initialize(void (*error_cb)())
{
#ifndef _WIN32
#ifdef ANDROID
m_thread.release(pthread_self());
#ifdef ANDROID
m_thread.release(pthread_self());
#else
m_thread.release(reinterpret_cast<u64>(pthread_self()));
#endif
@ -2622,7 +2622,7 @@ thread_base::~thread_base() noexcept
WaitForSingleObject(handle0, INFINITE);
CloseHandle(handle0);
#elif defined(ANDROID)
pthread_join(m_thread.load(), nullptr);
pthread_join(m_thread.load(), nullptr);
#else
pthread_join(reinterpret_cast<pthread_t>(m_thread.load()), nullptr);
#endif
@ -2697,11 +2697,10 @@ u64 thread_base::get_cycles()
#else
clockid_t _clock;
struct timespec thread_time;
pthread_t thread_id;
#ifdef ANDROID
thread_id = handle;
pthread_t thread_id = handle;
#else
thread_id = reinterpret_cast<pthread_t>(handle);
pthread_t thread_id = reinterpret_cast<pthread_t>(handle);
#endif
if (!pthread_getcpuclockid(thread_id, &_clock) && !clock_gettime(_clock, &thread_time))
{
@ -3326,7 +3325,7 @@ u64 thread_ctrl::get_tid()
#ifdef _WIN32
return GetCurrentThreadId();
#elif defined(ANDROID)
return static_cast<u64>(pthread_self());
return static_cast<u64>(pthread_self());
#elif defined(__linux__)
return syscall(SYS_gettid);
#else