Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-10 19:44:47 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-10 19:44:47 +0400
commitb880b01db5a6ff4dd7704c08bd2a7afc1654f8a1 (patch)
tree14226adfed0de534b7d0586aead6e3a037a95920 /intern/guardedalloc
parent180de82e4160f84a13b1d2e20ec7f6c9cad91383 (diff)
Fix OS X build error in malloc code, and warning in rna.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/intern/mallocn_intern.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
index cf77ce60e0a..29de1af3b8d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -55,6 +55,7 @@
# include <malloc.h>
# define HAVE_MALLOC_STATS
#elif defined(__APPLE__)
+# include <malloc/malloc.h>
# define malloc_usable_size malloc_size
#elif defined(WIN32)
# include <malloc.h>