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:
authorCampbell Barton <ideasman42@gmail.com>2011-02-17 11:35:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-02-17 11:35:15 +0300
commit538d9180d3a5f26ad7c50d0c8c8b1e0d94bcc30f (patch)
treeb682edbb3cb0e5bec3b805998726ccd41cf6b421 /intern/mikktspace
parentfb496b6bad881f8cebe4f8a687dacbe0f6ea93f9 (diff)
apply fix [#26117] Recent changes to "mikktspace.c" broke building on FreeBSD. Patch attached.
also check for NetBSD. note: we probably should use define HAVE_MALLOC_H, seems common for other projects.
Diffstat (limited to 'intern/mikktspace')
-rw-r--r--intern/mikktspace/mikktspace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index 3c03dfccf0d..71eae902667 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -24,8 +24,8 @@
#include <string.h>
#include <float.h>
-#ifdef __APPLE__
-#include <stdlib.h> /* OSX gets its malloc stuff through here */
+#if defined (__APPLE__) || defined (__FreeBSD__) || defined (__NetBSD__)
+#include <stdlib.h> /* OSX & BSD's get its malloc stuff through here */
#else
#include <malloc.h>
#endif