From 0711bae5e704fcb092f445a5e86c76867901f6f7 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Sat, 27 May 2023 04:11:24 -0400 Subject: [PATCH 1/2] Libmv: Remove FreeBSD sincos() workaround Pull Request: https://projects.blender.org/blender/blender/pulls/108346 --- intern/libmv/libmv/numeric/numeric.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/libmv/libmv/numeric/numeric.h b/intern/libmv/libmv/numeric/numeric.h index 52f3b8d6a78..c9c0bb19568 100644 --- a/intern/libmv/libmv/numeric/numeric.h +++ b/intern/libmv/libmv/numeric/numeric.h @@ -34,8 +34,8 @@ #include #if !defined(__MINGW64__) -# if defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || \ - defined(__NetBSD__) || defined(__HAIKU__) +# if defined(_WIN32) || defined(__APPLE__) || defined(__NetBSD__) || \ + defined(__HAIKU__) inline void sincos(double x, double* sinx, double* cosx) { *sinx = sin(x); *cosx = cos(x); From 670da740ba6a47dd18ceca5b4568aaca87feb7cc Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Thu, 25 May 2023 15:21:48 +0200 Subject: [PATCH 2/2] Build: fix OpenBSD error in guardedalloc Pull Request: https://projects.blender.org/blender/blender/pulls/108252 --- intern/guardedalloc/intern/mallocn_intern.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index 54acf7d6bd2..8a77a57b390 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -25,6 +25,8 @@ # define HAVE_MALLOC_STATS #elif defined(__FreeBSD__) # include +#elif defined(__OpenBSD__) +# undef USE_MALLOC_USABLE_SIZE #elif defined(__APPLE__) # include # define malloc_usable_size malloc_size