Merge branch 'master' of github.com:assimp/assimp into gcc-fixes

code/3DSLoader.h

@@ -48,6 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "../include/assimp/types.h"
 
+#ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
+
 struct aiNode;
 #include "3DSHelper.h"
 
@@ -271,6 +273,8 @@ protected:
 	bool bIsPrj;
 };
 
+#endif // !! ASSIMP_BUILD_NO_3DS_IMPORTER
+
 } // end of namespace Assimp
 
 #endif // AI_3DSIMPORTER_H_INC