v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
pull/267/head
Kim Kulling 2014-05-04 15:24:12 +02:00
parent 14457d2be4
commit 8c8c5329e9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/assimp/metadata.h
View File

@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Enum used to distinguish data types * Enum used to distinguish data types
*/ */
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
enum aiMetadataType typedef enum aiMetadataType
{ {
AI_BOOL = 0, AI_BOOL = 0,
AI_INT = 1, AI_INT = 1,
@ -72,7 +72,7 @@ enum aiMetadataType
#ifndef SWIG #ifndef SWIG
FORCE_32BIT = INT_MAX FORCE_32BIT = INT_MAX
#endif #endif
}; } aiMetadataType;

2
include/assimp/types.h
View File

@ -46,7 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_TYPES_H_INC #define AI_TYPES_H_INC
// Some runtime headers // Some runtime headers
#include <cstring>
#include <sys/types.h> #include <sys/types.h>
#include <memory.h> #include <memory.h>
#include <math.h> #include <math.h>
@ -66,6 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "quaternion.h" #include "quaternion.h"
#ifdef __cplusplus #ifdef __cplusplus
#include <cstring>
#include <new> // for std::nothrow_t #include <new> // for std::nothrow_t
#include <string> // for aiString::Set(const std::string&) #include <string> // for aiString::Set(const std::string&)