Fix OSX compilation problem with malloc.h in itasc
authorBenoit Bolsee <benoit.bolsee@online.be>
Fri, 25 Sep 2009 07:44:29 +0000 (07:44 +0000)
committerBenoit Bolsee <benoit.bolsee@online.be>
Fri, 25 Sep 2009 07:44:29 +0000 (07:44 +0000)
intern/itasc/Armature.cpp
intern/itasc/Cache.cpp
intern/itasc/CopyPose.cpp
intern/itasc/Distance.cpp
intern/itasc/MovingFrame.cpp

index 2491b0f8c9f47b38366bb16a0076b335290f43d2..6ae60089cd822c2285df2ccd90c7a0bf77cc4f1c 100644 (file)
@@ -7,8 +7,10 @@
 
 #include "Armature.hpp"
 #include <algorithm>
-#include <malloc.h>
 #include <string.h>
+#ifndef __STDC__
+#include <malloc.h>
+#endif
 
 namespace iTaSC {
 
index 1a1a3b4d0097886f28b9dbb37e6453dee75a304f..d61e5a9eab57252b0e53b772b7ccd1d5a7b14fe7 100644 (file)
@@ -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()
index 3bf7edd7975938077b45704fe970ca7d478c9eb9..7977089d2807619a78a0b97a38244e0c63f59723 100644 (file)
@@ -8,7 +8,6 @@
 #include "CopyPose.hpp"
 #include "kdl/kinfam_io.hpp"
 #include <math.h>
-#include <malloc.h>
 #include <string.h>
 
 namespace iTaSC
index 0f61e7666b25f55e53f92cc13fed92fd1cb983ed..bf19a978888f4228741e813d538b9d5c0763fde8 100644 (file)
@@ -8,7 +8,6 @@
 #include "Distance.hpp"
 #include "kdl/kinfam_io.hpp"
 #include <math.h>
-#include <malloc.h>
 #include <string.h>
 
 namespace iTaSC
index c0995383c4b3d7fb907ffd83b2a20b077421998d..e923b1fab279ddd494e078d90a8b20a6515ef767 100644 (file)
@@ -6,7 +6,6 @@
  */
 
 #include "MovingFrame.hpp"
-#include <malloc.h>
 #include <string.h>
 namespace iTaSC{