diff options
author | 2021-08-10 20:26:34 +0200 | |
---|---|---|
committer | 2021-08-10 20:26:34 +0200 | |
commit | a8514308791e1c69fb4295aa0a55736aaa17b2a9 (patch) | |
tree | 6e169c162ba8ff67d4b89537e7199d8f8f2d7588 /3rdparty/bx/src/os.cpp | |
parent | 9be98f7c8f7aee6f8172c322116af0f473228bee (diff) |
Update bx to latest
Diffstat (limited to '3rdparty/bx/src/os.cpp')
-rw-r--r-- | 3rdparty/bx/src/os.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/3rdparty/bx/src/os.cpp b/3rdparty/bx/src/os.cpp index ab5d6bd0935..12586aa8862 100644 --- a/3rdparty/bx/src/os.cpp +++ b/3rdparty/bx/src/os.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 Branimir Karadzic. All rights reserved. + * Copyright 2010-2021 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bx#license-bsd-2-clause */ @@ -27,15 +27,13 @@ || BX_PLATFORM_NX \ || BX_PLATFORM_OSX \ || BX_PLATFORM_PS4 \ - || BX_PLATFORM_RPI \ - || BX_PLATFORM_STEAMLINK + || BX_PLATFORM_RPI # include <sched.h> // sched_yield # if BX_PLATFORM_BSD \ || BX_PLATFORM_HAIKU \ || BX_PLATFORM_IOS \ || BX_PLATFORM_OSX \ - || BX_PLATFORM_PS4 \ - || BX_PLATFORM_STEAMLINK + || BX_PLATFORM_PS4 # include <pthread.h> // mach_port_t # endif // BX_PLATFORM_* @@ -47,8 +45,7 @@ # if BX_PLATFORM_ANDROID # include <malloc.h> // mallinfo # elif BX_PLATFORM_LINUX \ - || BX_PLATFORM_RPI \ - || BX_PLATFORM_STEAMLINK + || BX_PLATFORM_RPI # include <stdio.h> // fopen # include <unistd.h> // syscall # include <sys/syscall.h> @@ -101,8 +98,7 @@ namespace bx #if BX_PLATFORM_WINDOWS return ::GetCurrentThreadId(); #elif BX_PLATFORM_LINUX \ - || BX_PLATFORM_RPI \ - || BX_PLATFORM_STEAMLINK + || BX_PLATFORM_RPI return (pid_t)::syscall(SYS_gettid); #elif BX_PLATFORM_IOS \ || BX_PLATFORM_OSX |