[Bf-blender-cvs] [76f7a5b] master: Fix compilation error on kFreeBSD
Sebastian Ramacher
noreply at git.blender.org
Mon May 19 16:35:57 CEST 2014
Commit: 76f7a5bd6b75a1267ada200f108a9164ce069d10
Author: Sebastian Ramacher
Date: Sun May 18 17:06:20 2014 +0200
https://developer.blender.org/rB76f7a5bd6b75a1267ada200f108a9164ce069d10
Fix compilation error on kFreeBSD
===================================================================
M intern/guardedalloc/intern/mallocn_intern.h
===================================================================
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
index b0fd52d..a9d559e 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -51,7 +51,7 @@
#undef HAVE_MALLOC_STATS
-#if defined(__linux__)
+#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__))
# include <malloc.h>
# define HAVE_MALLOC_STATS
#elif defined(__FreeBSD__)
More information about the Bf-blender-cvs
mailing list