diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-30 14:07:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 14:07:15 +0100 |
| commit | f1cb475d9b1389bed00f252603ea7b05880c83ab (patch) | |
| tree | ae9e63c4c5fa49e56da998483f41e6faccea926d /thirdparty/bullet/LinearMath/btQuickprof.cpp | |
| parent | f69c116fa7b93b7a6e2aac7456fa547023335d7c (diff) | |
| parent | e495c2cb21f57e89e62a8d950411cdfa37dd8852 (diff) | |
Merge pull request #44807 from akien-mga/bullet-3.08
bullet: Sync with upstream 3.08
Diffstat (limited to 'thirdparty/bullet/LinearMath/btQuickprof.cpp')
| -rw-r--r-- | thirdparty/bullet/LinearMath/btQuickprof.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/thirdparty/bullet/LinearMath/btQuickprof.cpp b/thirdparty/bullet/LinearMath/btQuickprof.cpp index 86fd1d7812..33b51eb763 100644 --- a/thirdparty/bullet/LinearMath/btQuickprof.cpp +++ b/thirdparty/bullet/LinearMath/btQuickprof.cpp @@ -720,6 +720,9 @@ void btLeaveProfileZoneDefault() #define BT_HAVE_TLS 1 #elif __linux__ #define BT_HAVE_TLS 1 +#elif defined(__FreeBSD__) || defined(__NetBSD__) + // TODO: At the moment disabling purposely OpenBSD, albeit tls support exists but not fully functioning + #define BT_HAVE_TLS 1 #endif // __thread is broken on Andorid clang until r12b. See |