diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-30 09:56:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-30 10:05:21 +0300 |
commit | 28d2148b09a2d975876f4418bd5ba15ab5edea8d (patch) | |
tree | 0be71dfc4a7404ec33608958f1ed34c3e7d5914a /intern | |
parent | fa3d50af95fde76ef08590d2f86444f2f9fdca95 (diff) |
Haiku OS Support
D2860 by @miqlas
Even though Haiku is a niche OS, only minor changes are needed.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/guardedalloc/intern/mallocn_intern.h | 3 | ||||
-rw-r--r-- | intern/libmv/libmv/numeric/numeric.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index a292a2eb5a0..9a5848c50ad 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -63,6 +63,9 @@ #elif defined(WIN32) # include <malloc.h> # define malloc_usable_size _msize +#elif defined(__HAIKU__) +# include <malloc.h> +size_t malloc_usable_size(void *ptr); #else # pragma message "We don't know how to use malloc_usable_size on your platform" # undef USE_MALLOC_USABLE_SIZE diff --git a/intern/libmv/libmv/numeric/numeric.h b/intern/libmv/libmv/numeric/numeric.h index 1a23d653676..6312b4eb1a6 100644 --- a/intern/libmv/libmv/numeric/numeric.h +++ b/intern/libmv/libmv/numeric/numeric.h @@ -35,7 +35,8 @@ #if !defined(__MINGW64__) # if defined(_WIN32) || defined(__APPLE__) || \ - defined(__FreeBSD__) || defined(__NetBSD__) + defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__HAIKU__) inline void sincos(double x, double *sinx, double *cosx) { *sinx = sin(x); *cosx = cos(x); |