[Bf-blender-cvs] [d0573ce] master: Attempt to fix guardedalloc on OSX

[Sergey Sharybin]

Commit: d0573ce9054e325c0ad2fbb943087e0f8b9e159a
Author: Sergey Sharybin
Date:   Sat Jun 14 01:52:02 2014 +0600
https://developer.blender.org/rBd0573ce9054e325c0ad2fbb943087e0f8b9e159a

Attempt to fix guardedalloc on OSX

===================================================================

M	intern/guardedalloc/intern/mallocn.c
M	intern/guardedalloc/intern/mallocn_intern.h

===================================================================

diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index b0d252c..40f406d 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 a69bcf3..523d178 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)