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:
authorBenoit Bolsee <benoit.bolsee@online.be>2009-09-25 11:44:29 +0400
committerBenoit Bolsee <benoit.bolsee@online.be>2009-09-25 11:44:29 +0400
commit7c9bb3c40aecbb6e8e8045637c501433eed251f0 (patch)
tree689b14cbd59e101186e96e401cd54d77c63a89be /intern/itasc/Armature.cpp
parentb8c7910be12aab527fedfad7cab9337eaa5782a7 (diff)
Fix OSX compilation problem with malloc.h in itasc
Diffstat (limited to 'intern/itasc/Armature.cpp')
-rw-r--r--intern/itasc/Armature.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/itasc/Armature.cpp b/intern/itasc/Armature.cpp
index 2491b0f8c9f..6ae60089cd8 100644
--- a/intern/itasc/Armature.cpp
+++ b/intern/itasc/Armature.cpp
@@ -7,8 +7,10 @@
#include "Armature.hpp"
#include <algorithm>
-#include <malloc.h>
#include <string.h>
+#ifndef __STDC__
+#include <malloc.h>
+#endif
namespace iTaSC {