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

bugfix: fix cexport API for c compilers.

pull/274/head
Kim Kulling 2014-05-11 16:50:35 +02:00
parent 9245469fb8
commit fb1c9ab86d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/assimp/cexport.h
View File

@ -211,10 +211,10 @@ struct aiExportDataBlob
extension that should be used when writing extension that should be used when writing
the data to disc. the data to disc.
*/ */
aiString name; C_STRUCT aiString name;
/** Pointer to the next blob in the chain or NULL if there is none. */ /** Pointer to the next blob in the chain or NULL if there is none. */
aiExportDataBlob * next; C_STRUCT aiExportDataBlob * next;
#ifdef __cplusplus #ifdef __cplusplus
/// Default constructor /// Default constructor
@ -247,7 +247,7 @@ ASSIMP_API const C_STRUCT aiExportDataBlob* aiExportSceneToBlob( const C_STRUCT
* returned by aiExportScene(). * returned by aiExportScene().
* @param pData the data blob returned by #aiExportSceneToBlob * @param pData the data blob returned by #aiExportSceneToBlob
*/ */
ASSIMP_API C_STRUCT void aiReleaseExportBlob( const C_STRUCT aiExportDataBlob* pData ); ASSIMP_API void aiReleaseExportBlob( const C_STRUCT aiExportDataBlob* pData );
#ifdef __cplusplus #ifdef __cplusplus
} }

4
include/assimp/types.h
View File

@ -371,7 +371,7 @@ struct aiString
/** Standard return type for some library functions. /** Standard return type for some library functions.
* Rarely used, and if, mostly in the C API. * Rarely used, and if, mostly in the C API.
*/ */
enum aiReturn typedef enum aiReturn
{ {
/** Indicates that a function was successful */ /** Indicates that a function was successful */
aiReturn_SUCCESS = 0x0, aiReturn_SUCCESS = 0x0,
@ -388,7 +388,7 @@ enum aiReturn
* Force 32-bit size enum * Force 32-bit size enum
*/ */
_AI_ENFORCE_ENUM_SIZE = 0x7fffffff _AI_ENFORCE_ENUM_SIZE = 0x7fffffff
}; // !enum aiReturn } aiReturn; // !enum aiReturn
// just for backwards compatibility, don't use these constants anymore // just for backwards compatibility, don't use these constants anymore
#define AI_SUCCESS aiReturn_SUCCESS #define AI_SUCCESS aiReturn_SUCCESS

1
test/unit/CCompilerTest.c
View File

@ -6,3 +6,4 @@
#include <assimp/version.h> #include <assimp/version.h>
#include <assimp/config.h> #include <assimp/config.h>
#include <assimp/cimport.h> #include <assimp/cimport.h>
#include <assimp/cexport.h>