gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: unused NO_THREADS #ifdefs

Browse Source
This commit is contained in:
Rubidium 2023-06-27 21:28:14 +02:00 committed by rubidium42
parent 55979b612e
commit 69d5b9d326
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/unix/unix.cpp
View File

@ -20,6 +20,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <time.h> #include <time.h>
#include <signal.h> #include <signal.h>
#include <pthread.h>
#ifdef WITH_SDL2 #ifdef WITH_SDL2
#include <SDL.h> #include <SDL.h>
@ -47,10 +48,6 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#ifndef NO_THREADS
#include <pthread.h>
#endif
#if defined(__APPLE__) #if defined(__APPLE__)
# include "../macosx/macos.h" # include "../macosx/macos.h"
#endif #endif
@ -258,11 +255,9 @@ void OSOpenBrowser(const char *url)
#endif /* __APPLE__ */ #endif /* __APPLE__ */
void SetCurrentThreadName(const char *threadName) { void SetCurrentThreadName(const char *threadName) {
#if !defined(NO_THREADS) && defined(__GLIBC__) #if defined(__GLIBC__)
#if __GLIBC_PREREQ(2, 12)
if (threadName) pthread_setname_np(pthread_self(), threadName); if (threadName) pthread_setname_np(pthread_self(), threadName);
#endif /* __GLIBC_PREREQ(2, 12) */ #endif /* defined(__GLIBC__) */
#endif /* !defined(NO_THREADS) && defined(__GLIBC__) */
#if defined(__APPLE__) #if defined(__APPLE__)
MacOSSetThreadName(threadName); MacOSSetThreadName(threadName);
#endif /* defined(__APPLE__) */ #endif /* defined(__APPLE__) */

2
src/thread.h
View File

@ -45,7 +45,6 @@ void SetCurrentThreadName(const char *name);
template<class TFn, class... TArgs> template<class TFn, class... TArgs>
inline bool StartNewThread(std::thread *thr, const char *name, TFn&& _Fx, TArgs&&... _Ax) inline bool StartNewThread(std::thread *thr, const char *name, TFn&& _Fx, TArgs&&... _Ax)
{ {
#ifndef NO_THREADS
try { try {
static std::mutex thread_startup_mutex; static std::mutex thread_startup_mutex;
std::lock_guard<std::mutex> lock(thread_startup_mutex); std::lock_guard<std::mutex> lock(thread_startup_mutex);
@ -79,7 +78,6 @@ inline bool StartNewThread(std::thread *thr, const char *name, TFn&& _Fx, TArgs&
/* Something went wrong, the system we are running on might not support threads. */ /* Something went wrong, the system we are running on might not support threads. */
Debug(misc, 1, "Can't create thread '{}': {}", name, e.what()); Debug(misc, 1, "Can't create thread '{}': {}", name, e.what());
} }
#endif
return false; return false;
} }