Merge branch 'master' of https://github.com/assimp/assimp

2016-11-10 16:26:57 +01:00
parent 1c5030c642 b04069b441
commit 1126f8dade
1 changed files with 1 additions and 1 deletions
--- a/include/assimp/cimport.h
+++ b/include/assimp/cimport.h
@@ -337,7 +337,7 @@ ASSIMP_API void aiReleaseImport(
 * import process. NULL if there was no error. There can't be an error if you
 * got a non-NULL #aiScene from #aiImportFile/#aiImportFileEx/#aiApplyPostProcessing.
 */
-ASSIMP_API const char* aiGetErrorString();
+ASSIMP_API const char* aiGetErrorString(void);

 // --------------------------------------------------------------------------------
 /** Returns whether a given file extension is supported by ASSIMP