From f435712273a7bfec295e341e1d19910d837b4303 Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Fri, 17 Apr 2015 06:42:58 +0200 Subject: [PATCH] Fix Mac build issues (clang 6.0 compiling x86_64) --- code/ObjFileMtlImporter.cpp | 1 + code/Q3BSPZipArchive.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp index 91703e6d6..bef8e478e 100644 --- a/code/ObjFileMtlImporter.cpp +++ b/code/ObjFileMtlImporter.cpp @@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER +#include #include "ObjFileMtlImporter.h" #include "ObjTools.h" #include "ObjFileData.h" diff --git a/code/Q3BSPZipArchive.cpp b/code/Q3BSPZipArchive.cpp index ebbf77206..a418bf0c6 100644 --- a/code/Q3BSPZipArchive.cpp +++ b/code/Q3BSPZipArchive.cpp @@ -140,11 +140,11 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) { ZipFile::ZipFile(size_t size) : m_Size(size) { ai_assert(m_Size != 0); - m_Buffer = std::malloc(m_Size); + m_Buffer = malloc(m_Size); } ZipFile::~ZipFile() { - std::free(m_Buffer); + free(m_Buffer); m_Buffer = NULL; }