forked from bartvdbraak/blender
Attempt to fix guardedalloc on OSX
This commit is contained in:
parent
2b7ff6de06
commit
d0573ce905
@ -32,6 +32,8 @@
|
|||||||
/* to ensure strict conversions */
|
/* to ensure strict conversions */
|
||||||
#include "../../source/blender/blenlib/BLI_strict_flags.h"
|
#include "../../source/blender/blenlib/BLI_strict_flags.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
#include "mallocn_intern.h"
|
#include "mallocn_intern.h"
|
||||||
|
|
||||||
size_t (*MEM_allocN_len)(const void *vmemh) = MEM_lockfree_allocN_len;
|
size_t (*MEM_allocN_len)(const void *vmemh) = MEM_lockfree_allocN_len;
|
||||||
|
@ -100,7 +100,7 @@
|
|||||||
#else
|
#else
|
||||||
// Apple's malloc is 16-byte aligned, and does not have malloc.h, so include
|
// Apple's malloc is 16-byte aligned, and does not have malloc.h, so include
|
||||||
// stdilb instead.
|
// stdilb instead.
|
||||||
# include <cstdlib>
|
# include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define IS_POW2(a) (((a) & ((a) - 1)) == 0)
|
#define IS_POW2(a) (((a) & ((a) - 1)) == 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user