diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-13 23:52:02 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-13 23:52:35 +0400 |
| commit | d0573ce9054e325c0ad2fbb943087e0f8b9e159a (patch) | |
| tree | 2a7c1ddcf06e18e1bd28907e5b22402eb1b1176f /intern/guardedalloc | |
| parent | 2b7ff6de069aab63ca10b7fd6f85a133d136a56c (diff) | |
Attempt to fix guardedalloc on OSX
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 2 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_intern.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index b0d252cca14..40f406d0ae2 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -32,6 +32,8 @@ /* to ensure strict conversions */ #include "../../source/blender/blenlib/BLI_strict_flags.h" +#include <assert.h> + #include "mallocn_intern.h" size_t (*MEM_allocN_len)(const void *vmemh) = MEM_lockfree_allocN_len; diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index a69bcf3d27b..523d1786b97 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -100,7 +100,7 @@ #else // Apple's malloc is 16-byte aligned, and does not have malloc.h, so include // stdilb instead. -# include <cstdlib> +# include <stdlib.h> #endif #define IS_POW2(a) (((a) & ((a) - 1)) == 0) |