diff options
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/bx/src/mutex.cpp | 10 | ||||
| -rw-r--r-- | 3rdparty/bx/src/os.cpp | 14 | ||||
| -rw-r--r-- | 3rdparty/bx/src/thread.cpp | 15 |
3 files changed, 5 insertions, 34 deletions
diff --git a/3rdparty/bx/src/mutex.cpp b/3rdparty/bx/src/mutex.cpp index 0ef8597a8aa..9e5845935b1 100644 --- a/3rdparty/bx/src/mutex.cpp +++ b/3rdparty/bx/src/mutex.cpp @@ -10,15 +10,7 @@ #if BX_CRT_NONE # include <bx/cpu.h> # include "crt0.h" -#elif BX_PLATFORM_ANDROID \ - || BX_PLATFORM_BSD \ - || BX_PLATFORM_HAIKU \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_IOS \ - || BX_PLATFORM_OSX \ - || BX_PLATFORM_PS4 \ - || BX_PLATFORM_RPI \ - || BX_PLATFORM_NX +#elif BX_PLATFORM_POSIX # include <pthread.h> #elif BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ diff --git a/3rdparty/bx/src/os.cpp b/3rdparty/bx/src/os.cpp index 99394579b72..917b02e8c5a 100644 --- a/3rdparty/bx/src/os.cpp +++ b/3rdparty/bx/src/os.cpp @@ -19,17 +19,7 @@ # endif // WIN32_LEAN_AND_MEAN # include <windows.h> # include <psapi.h> -#elif BX_PLATFORM_ANDROID \ - || BX_PLATFORM_BSD \ - || BX_PLATFORM_EMSCRIPTEN \ - || BX_PLATFORM_HAIKU \ - || BX_PLATFORM_HURD \ - || BX_PLATFORM_IOS \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_NX \ - || BX_PLATFORM_OSX \ - || BX_PLATFORM_PS4 \ - || BX_PLATFORM_RPI +#elif BX_PLATFORM_POSIX # include <sched.h> // sched_yield # if BX_PLATFORM_BSD \ || BX_PLATFORM_HAIKU \ @@ -58,7 +48,7 @@ # include <mach/mach.h> // mach_task_basic_info # elif BX_PLATFORM_HURD # include <stdio.h> // fopen -# include <pthread/pthread.h> // pthread_self +# include <pthread.h> // pthread_self # elif BX_PLATFORM_ANDROID # include "debug.h" // getTid is not implemented... # endif // BX_PLATFORM_ANDROID diff --git a/3rdparty/bx/src/thread.cpp b/3rdparty/bx/src/thread.cpp index f5e5f81bc21..162d4cafaf0 100644 --- a/3rdparty/bx/src/thread.cpp +++ b/3rdparty/bx/src/thread.cpp @@ -14,22 +14,11 @@ #if BX_CRT_NONE # include "crt0.h" -#elif BX_PLATFORM_ANDROID \ - || BX_PLATFORM_BSD \ - || BX_PLATFORM_HAIKU \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_IOS \ - || BX_PLATFORM_OSX \ - || BX_PLATFORM_PS4 \ - || BX_PLATFORM_RPI \ - || BX_PLATFORM_NX +#elif BX_PLATFORM_POSIX # include <pthread.h> # if BX_PLATFORM_BSD # include <pthread_np.h> # endif // BX_PLATFORM_BSD -# if BX_PLATFORM_LINUX && (BX_CRT_GLIBC < 21200) -# include <sys/prctl.h> -# endif // BX_PLATFORM_ #elif BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ || BX_PLATFORM_XBOXONE \ @@ -250,7 +239,7 @@ namespace bx #elif BX_PLATFORM_OSX \ || BX_PLATFORM_IOS pthread_setname_np(_name); -#elif (BX_CRT_GLIBC >= 21200) && ! BX_PLATFORM_HURD +#elif BX_CRT_GLIBC && ! BX_PLATFORM_HURD pthread_setname_np(ti->m_handle, _name); #elif BX_PLATFORM_LINUX prctl(PR_SET_NAME,_name, 0, 0, 0); |
