Merge branch 'master' into cleanup_public_header

2021-09-14 20:46:22 +02:00 · 2021-09-14 20:46:22 +02:00 · 113217790b
parent 0fef0e1101 002cdcdd7f
commit 113217790b
1 changed files with 2 additions and 2 deletions
--- a/include/assimp/scene.h
+++ b/include/assimp/scene.h
@ -437,7 +437,7 @@ struct aiScene
 };

 #ifdef __cplusplus
-} //! namespace Assimp
-#endif
+} 
+#endif //! extern "C"

 #endif // AI_SCENE_H_INC