From a9e8a24b60d25d79ec1e5fe177b769da17f9eb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Thu, 17 Oct 2019 08:32:32 -0700 Subject: [PATCH] Cleanup. --- include/bx/platform.h | 10 +++++----- src/mutex.cpp | 2 +- src/thread.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/bx/platform.h b/include/bx/platform.h index 1565482..d4445d3 100644 --- a/include/bx/platform.h +++ b/include/bx/platform.h @@ -30,12 +30,12 @@ // C Runtime #define BX_CRT_BIONIC 0 +#define BX_CRT_BSD 0 #define BX_CRT_GLIBC 0 #define BX_CRT_LIBCXX 0 #define BX_CRT_MINGW 0 #define BX_CRT_MSVC 0 #define BX_CRT_NEWLIB 0 -#define BX_CRT_BSD 0 #ifndef BX_CRT_MUSL # define BX_CRT_MUSL 0 @@ -249,13 +249,13 @@ # endif // # if !BX_CRT_BIONIC \ + && !BX_CRT_BSD \ && !BX_CRT_GLIBC \ && !BX_CRT_LIBCXX \ && !BX_CRT_MINGW \ && !BX_CRT_MSVC \ && !BX_CRT_MUSL \ - && !BX_CRT_NEWLIB \ - && !BX_CRT_BSD + && !BX_CRT_NEWLIB # undef BX_CRT_NONE # define BX_CRT_NONE 1 # endif // BX_CRT_* @@ -418,6 +418,8 @@ #if BX_CRT_BIONIC # define BX_CRT_NAME "Bionic libc" +#elif BX_CRT_BSD +# define BX_CRT_NAME "BSD libc" #elif BX_CRT_GLIBC # define BX_CRT_NAME "GNU C Library" #elif BX_CRT_MSVC @@ -430,8 +432,6 @@ # define BX_CRT_NAME "Newlib" #elif BX_CRT_MUSL # define BX_CRT_NAME "musl libc" -#elif BX_CRT_BSD -# define BX_CRT_NAME "BSD" #elif BX_CRT_NONE # define BX_CRT_NAME "None" #else diff --git a/src/mutex.cpp b/src/mutex.cpp index 70aa4c2..2fe5eaf 100644 --- a/src/mutex.cpp +++ b/src/mutex.cpp @@ -12,12 +12,12 @@ # include # 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_BSD \ || BX_PLATFORM_RPI # include #elif BX_PLATFORM_WINDOWS \ diff --git a/src/thread.cpp b/src/thread.cpp index a7a2550..9525105 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -15,12 +15,12 @@ #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_BSD \ || BX_PLATFORM_RPI # include # if defined(__FreeBSD__)