diff options
| -rw-r--r-- | intern/itasc/Armature.cpp | 4 | ||||
| -rw-r--r-- | intern/itasc/Cache.cpp | 5 | ||||
| -rw-r--r-- | intern/itasc/CopyPose.cpp | 1 | ||||
| -rw-r--r-- | intern/itasc/Distance.cpp | 1 | ||||
| -rw-r--r-- | intern/itasc/MovingFrame.cpp | 1 |
5 files changed, 6 insertions, 6 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 { diff --git a/intern/itasc/Cache.cpp b/intern/itasc/Cache.cpp index 1a1a3b4d009..d61e5a9eab5 100644 --- a/intern/itasc/Cache.cpp +++ b/intern/itasc/Cache.cpp @@ -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() diff --git a/intern/itasc/CopyPose.cpp b/intern/itasc/CopyPose.cpp index 3bf7edd7975..7977089d280 100644 --- a/intern/itasc/CopyPose.cpp +++ b/intern/itasc/CopyPose.cpp @@ -8,7 +8,6 @@ #include "CopyPose.hpp" #include "kdl/kinfam_io.hpp" #include <math.h> -#include <malloc.h> #include <string.h> namespace iTaSC diff --git a/intern/itasc/Distance.cpp b/intern/itasc/Distance.cpp index 0f61e7666b2..bf19a978888 100644 --- a/intern/itasc/Distance.cpp +++ b/intern/itasc/Distance.cpp @@ -8,7 +8,6 @@ #include "Distance.hpp" #include "kdl/kinfam_io.hpp" #include <math.h> -#include <malloc.h> #include <string.h> namespace iTaSC diff --git a/intern/itasc/MovingFrame.cpp b/intern/itasc/MovingFrame.cpp index c0995383c4b..e923b1fab27 100644 --- a/intern/itasc/MovingFrame.cpp +++ b/intern/itasc/MovingFrame.cpp @@ -6,7 +6,6 @@ */ #include "MovingFrame.hpp" -#include <malloc.h> #include <string.h> namespace iTaSC{ |