From 8c8c5329e91b95463134620afbba60a0e5255f32 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Sun, 4 May 2014 15:24:12 +0200
Subject: [PATCH] bugfix: - fix c-api: insert a missing typedef for the
 metadata api enum. - gix c-api: move cpp-include to cpp-part of the api.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
---
 include/assimp/metadata.h | 4 ++--
 include/assimp/scene.h    | 8 ++++----
 include/assimp/types.h    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/assimp/metadata.h b/include/assimp/metadata.h
index 0caf4076b..8c8880e81 100644
--- a/include/assimp/metadata.h
+++ b/include/assimp/metadata.h
@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   * Enum used to distinguish data types
   */
  // -------------------------------------------------------------------------------
-enum aiMetadataType
+typedef enum aiMetadataType
 {
 	AI_BOOL = 0, 
 	AI_INT = 1, 
@@ -72,7 +72,7 @@ enum aiMetadataType
 #ifndef SWIG
 	FORCE_32BIT = INT_MAX
 #endif
-};
+} aiMetadataType;
 
 
 
diff --git a/include/assimp/scene.h b/include/assimp/scene.h
index 506759419..87f13152f 100644
--- a/include/assimp/scene.h
+++ b/include/assimp/scene.h
@@ -122,14 +122,14 @@ struct aiNode
 #ifdef __cplusplus
 	/** Constructor */
 	aiNode() 
-		// set all members to zero by default
+		// set all members to zero by default
 		: mName("")
 		, mParent(NULL)
 		, mNumChildren(0)
 		, mChildren(NULL)
 		, mNumMeshes(0)
 		, mMeshes(NULL)
-		, mMetaData(NULL)
+		, mMetaData(NULL)
 	{
 	}
 	
@@ -137,13 +137,13 @@ struct aiNode
 	/** Construction from a specific name */
 	aiNode(const std::string& name) 
 		// set all members to zero by default
-		: mName(name)
+		: mName(name)
 		, mParent(NULL)
 		, mNumChildren(0)
 		, mChildren(NULL)
 		, mNumMeshes(0)
 		, mMeshes(NULL)
-		, mMetaData(NULL)
+		, mMetaData(NULL)
 	{
 	}
 
diff --git a/include/assimp/types.h b/include/assimp/types.h
index 822490a45..73ab85b3d 100644
--- a/include/assimp/types.h
+++ b/include/assimp/types.h
@@ -46,7 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_TYPES_H_INC
 
 // Some runtime headers
-#include <cstring>
 #include <sys/types.h>
 #include <memory.h>
 #include <math.h>
@@ -66,6 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "quaternion.h"
 
 #ifdef __cplusplus
+#include <cstring>
 #include <new>		// for std::nothrow_t
 #include <string>	// for aiString::Set(const std::string&)