Assorted GCC fixes for OpenCOLLADA support

4 files changed, 11 insertions, 3 deletions

diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp
index 527ccd66577..bf75baaf89d 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@ -35,7 +35,7 @@
 #include "BKE_action.h"
 #include "BKE_armature.h"
 
-#include "BLI_listBase.h"
+#include "BLI_listbase.h"
 
 #include "GeometryExporter.h"
 #include "ArmatureExporter.h"
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index ad85a81c6f8..914c8a656f9 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -186,7 +186,7 @@ void forEachMaterialInScene(Scene *sce, Functor &f)
 {
 	ForEachMaterialFunctor<Functor> matfunc(&f);
 	GeometryFunctor gf;
-	gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor>>(sce, matfunc);
+	gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor> >(sce, matfunc);
 }
 
 // OB_MESH is assumed
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 34da6c9e897..df5136f1cb4 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -24,6 +24,10 @@
 
 #include <algorithm>
 
+#ifndef WIN32
+#include <iostream>
+#endif
+
 #include "COLLADAFWMeshPrimitive.h"
 #include "COLLADAFWMeshVertexData.h"
 #include "COLLADAFWPolygons.h"
@@ -904,4 +908,4 @@ bool MeshImporter::write_geometry(const COLLADAFW::Geometry* geom)
 	mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
 
 	return true;
-}
\ No newline at end of file
+}
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp
index 58985d58db3..a3ac6a30c59 100644
--- a/source/blender/collada/SkinInfo.cpp
+++ b/source/blender/collada/SkinInfo.cpp
@@ -24,6 +24,10 @@
 
 #include <algorithm>
 
+#ifndef WIN32
+#include <stdint.h>
+#endif
+
 #include "BKE_object.h"
 #include "DNA_armature_types.h"
 #include "DNA_modifier_types.h"