[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23479] trunk/blender/intern/itasc: Fix OSX compilation problem with malloc.h in itasc
Benoit Bolsee
benoit.bolsee at online.be
Fri Sep 25 09:44:29 CEST 2009
Revision: 23479
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23479
Author: ben2610
Date: 2009-09-25 09:44:29 +0200 (Fri, 25 Sep 2009)
Log Message:
-----------
Fix OSX compilation problem with malloc.h in itasc
Modified Paths:
--------------
trunk/blender/intern/itasc/Armature.cpp
trunk/blender/intern/itasc/Cache.cpp
trunk/blender/intern/itasc/CopyPose.cpp
trunk/blender/intern/itasc/Distance.cpp
trunk/blender/intern/itasc/MovingFrame.cpp
Modified: trunk/blender/intern/itasc/Armature.cpp
===================================================================
--- trunk/blender/intern/itasc/Armature.cpp 2009-09-25 07:20:32 UTC (rev 23478)
+++ trunk/blender/intern/itasc/Armature.cpp 2009-09-25 07:44:29 UTC (rev 23479)
@@ -7,8 +7,10 @@
#include "Armature.hpp"
#include <algorithm>
+#include <string.h>
+#ifndef __STDC__
#include <malloc.h>
-#include <string.h>
+#endif
namespace iTaSC {
Modified: trunk/blender/intern/itasc/Cache.cpp
===================================================================
--- trunk/blender/intern/itasc/Cache.cpp 2009-09-25 07:20:32 UTC (rev 23478)
+++ trunk/blender/intern/itasc/Cache.cpp 2009-09-25 07:44:29 UTC (rev 23479)
@@ -6,11 +6,12 @@
*/
#include <string.h>
#include <assert.h>
+#include <math.h>
+#ifndef __STDC__
#include <malloc.h>
+#endif
#include "Cache.hpp"
-#include <math.h>
-
namespace iTaSC {
CacheEntry::~CacheEntry()
Modified: trunk/blender/intern/itasc/CopyPose.cpp
===================================================================
--- trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 07:20:32 UTC (rev 23478)
+++ trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 07:44:29 UTC (rev 23479)
@@ -8,7 +8,6 @@
#include "CopyPose.hpp"
#include "kdl/kinfam_io.hpp"
#include <math.h>
-#include <malloc.h>
#include <string.h>
namespace iTaSC
Modified: trunk/blender/intern/itasc/Distance.cpp
===================================================================
--- trunk/blender/intern/itasc/Distance.cpp 2009-09-25 07:20:32 UTC (rev 23478)
+++ trunk/blender/intern/itasc/Distance.cpp 2009-09-25 07:44:29 UTC (rev 23479)
@@ -8,7 +8,6 @@
#include "Distance.hpp"
#include "kdl/kinfam_io.hpp"
#include <math.h>
-#include <malloc.h>
#include <string.h>
namespace iTaSC
Modified: trunk/blender/intern/itasc/MovingFrame.cpp
===================================================================
--- trunk/blender/intern/itasc/MovingFrame.cpp 2009-09-25 07:20:32 UTC (rev 23478)
+++ trunk/blender/intern/itasc/MovingFrame.cpp 2009-09-25 07:44:29 UTC (rev 23479)
@@ -6,7 +6,6 @@
*/
#include "MovingFrame.hpp"
-#include <malloc.h>
#include <string.h>
namespace iTaSC{
More information about the Bf-blender-cvs
mailing list