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

# fix C issues in the headers. This fixes [3481648] (https://sourceforge.net/tracker/?func=detail&aid=3481648&group_id=226462&atid=1067632) 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1137 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
aramis_acg 2012-02-02 13:56:45 +00:00
parent 38e6d90e40
commit daf7c07ff1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/aiVector2D.h
View File

@ -96,8 +96,8 @@ typedef aiVector2t<float> aiVector2D;
#else #else
struct aiVector2t { struct aiVector2D {
TReal x,y; float x,y;
}; };
#endif // __cplusplus #endif // __cplusplus

2
include/aiVector3D.h
View File

@ -127,7 +127,7 @@ typedef aiVector3t<float> aiVector3D;
struct aiVector3D { struct aiVector3D {
float x,y,y; float x,y,z;
} PACK_STRUCT; } PACK_STRUCT;
#endif // __cplusplus #endif // __cplusplus

10
include/assimp.h
View File

@ -81,7 +81,7 @@ struct aiLogStream
* @see aiSetPropertyString * @see aiSetPropertyString
*/ */
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
struct aiPropertyStore {}; struct aiPropertyStore { char sentinel; };
/** Our own C boolean type */ /** Our own C boolean type */
typedef int aiBool; typedef int aiBool;
@ -344,7 +344,7 @@ ASSIMP_API C_STRUCT aiPropertyStore* aiCreatePropertyStore(void);
/** Delete a property store. /** Delete a property store.
* @param p Property store to be deleted. * @param p Property store to be deleted.
*/ */
ASSIMP_API void aiReleasePropertyStore(aiPropertyStore* p); ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
/** Set an integer property. /** Set an integer property.
@ -358,7 +358,7 @@ ASSIMP_API void aiReleasePropertyStore(aiPropertyStore* p);
* @param value New value for the property * @param value New value for the property
*/ */
ASSIMP_API void aiSetImportPropertyInteger( ASSIMP_API void aiSetImportPropertyInteger(
aiPropertyStore* store, C_STRUCT aiPropertyStore* store,
const char* szName, const char* szName,
int value); int value);
@ -374,7 +374,7 @@ ASSIMP_API void aiSetImportPropertyInteger(
* @param value New value for the property * @param value New value for the property
*/ */
ASSIMP_API void aiSetImportPropertyFloat( ASSIMP_API void aiSetImportPropertyFloat(
aiPropertyStore* store, C_STRUCT aiPropertyStore* store,
const char* szName, const char* szName,
float value); float value);
@ -391,7 +391,7 @@ ASSIMP_API void aiSetImportPropertyFloat(
* @param value New value for the property * @param value New value for the property
*/ */
ASSIMP_API void aiSetImportPropertyString( ASSIMP_API void aiSetImportPropertyString(
aiPropertyStore* store, C_STRUCT aiPropertyStore* store,
const char* szName, const char* szName,
const C_STRUCT aiString* st); const C_STRUCT aiString* st);