diff --git a/src/file.cpp b/src/file.cpp index 0d1024f..2ed4fe6 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -72,9 +72,7 @@ namespace bx # define ftello64 _ftelli64 # elif 0 \ || BX_PLATFORM_ANDROID \ - || BX_PLATFORM_BSD \ || BX_PLATFORM_EMSCRIPTEN \ - || BX_PLATFORM_HAIKU \ || BX_PLATFORM_IOS \ || BX_PLATFORM_OSX # define fseeko64 fseeko diff --git a/src/mutex.cpp b/src/mutex.cpp index f40926a..a094687 100644 --- a/src/mutex.cpp +++ b/src/mutex.cpp @@ -11,8 +11,6 @@ # include # include "crt0.h" #elif BX_PLATFORM_ANDROID \ - || BX_PLATFORM_BSD \ - || BX_PLATFORM_HAIKU \ || BX_PLATFORM_LINUX \ || BX_PLATFORM_IOS \ || BX_PLATFORM_OSX \ diff --git a/src/os.cpp b/src/os.cpp index 22234a9..faf3498 100644 --- a/src/os.cpp +++ b/src/os.cpp @@ -20,10 +20,7 @@ # include # include #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 \ @@ -31,9 +28,7 @@ || BX_PLATFORM_PS4 \ || BX_PLATFORM_RPI # include // sched_yield -# if BX_PLATFORM_BSD \ - || BX_PLATFORM_HAIKU \ - || BX_PLATFORM_IOS \ +# if BX_PLATFORM_IOS \ || BX_PLATFORM_OSX \ || BX_PLATFORM_PS4 # include // mach_port_t @@ -51,14 +46,8 @@ # include // fopen # include // syscall # include -# elif BX_PLATFORM_HAIKU -# include // fopen -# include // syscall # elif BX_PLATFORM_OSX # include // mach_task_basic_info -# elif BX_PLATFORM_HURD -# include // fopen -# include // pthread_self # elif BX_PLATFORM_ANDROID # include "debug.h" // getTid is not implemented... # endif // BX_PLATFORM_ANDROID @@ -105,10 +94,6 @@ namespace bx #elif BX_PLATFORM_IOS \ || BX_PLATFORM_OSX return (mach_port_t)::pthread_mach_thread_np(pthread_self() ); -#elif BX_PLATFORM_BSD - return *(uint32_t*)::pthread_self(); -#elif BX_PLATFORM_HURD - return (pthread_t)::pthread_self(); #else debugOutput("getTid is not implemented"); debugBreak(); return 0; @@ -120,8 +105,7 @@ namespace bx #if BX_PLATFORM_ANDROID struct mallinfo mi = mallinfo(); return mi.uordblks; -#elif BX_PLATFORM_LINUX \ - || BX_PLATFORM_HURD +#elif BX_PLATFORM_LINUX FILE* file = fopen("/proc/self/statm", "r"); if (NULL == file) { @@ -320,8 +304,7 @@ namespace bx void* exec(const char* const* _argv) { -#if BX_PLATFORM_LINUX \ - || BX_PLATFORM_HURD +#if BX_PLATFORM_LINUX pid_t pid = fork(); if (0 == pid) @@ -376,7 +359,7 @@ namespace bx #else BX_UNUSED(_argv); return NULL; -#endif // BX_PLATFORM_LINUX || BX_PLATFORM_HURD +#endif // BX_PLATFORM_LINUX } void exit(int32_t _exitCode) diff --git a/src/thread.cpp b/src/thread.cpp index 2dce0ca..8c08bba 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -15,8 +15,6 @@ #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 \ @@ -24,9 +22,6 @@ || BX_PLATFORM_RPI \ || BX_PLATFORM_NX # include -# if BX_PLATFORM_BSD -# include -# endif // BX_PLATFORM_BSD # if BX_PLATFORM_LINUX && (BX_CRT_GLIBC < 21200) # include # endif // BX_PLATFORM_ @@ -250,16 +245,10 @@ 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 >= 21200) pthread_setname_np(ti->m_handle, _name); #elif BX_PLATFORM_LINUX prctl(PR_SET_NAME,_name, 0, 0, 0); -#elif BX_PLATFORM_BSD -# if defined(__NetBSD__) - pthread_setname_np(ti->m_handle, "%s", (void*)_name); -# else - pthread_set_name_np(ti->m_handle, _name); -# endif // defined(__NetBSD__) #elif BX_PLATFORM_WINDOWS // Try to use the new thread naming API from Win10 Creators update onwards if we have it typedef HRESULT (WINAPI *SetThreadDescriptionProc)(HANDLE, PCWSTR);