From 1e6eac9e653f967f96655ab68ce12f64b225c571 Mon Sep 17 00:00:00 2001 From: follower Date: Fri, 2 Aug 2019 04:44:21 +1200 Subject: [PATCH 1/2] Fix error when building assimp on older Mac OS X version. Prevents this error when building with Mac OS X 10.9 SDK: error: no member named 'atoi' in namespace 'std'; did you mean simply 'atoi'? --- include/assimp/scene.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/assimp/scene.h b/include/assimp/scene.h index e973f6c5b..df5d6f3b5 100644 --- a/include/assimp/scene.h +++ b/include/assimp/scene.h @@ -56,6 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "material.h" #include "anim.h" #include "metadata.h" +#include #ifdef __cplusplus extern "C" { From 7ee7946dc56d4260affcb56b6322bf440f2fc40f Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sun, 18 Aug 2019 09:40:13 +0200 Subject: [PATCH 2/2] Update scene.h use #include only if the compiler is used to compile c++ code. --- include/assimp/scene.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/scene.h b/include/assimp/scene.h index df5d6f3b5..2667db85b 100644 --- a/include/assimp/scene.h +++ b/include/assimp/scene.h @@ -56,9 +56,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "material.h" #include "anim.h" #include "metadata.h" -#include #ifdef __cplusplus +# include extern "C" { #endif