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

Fix Mac build issues (clang 6.0 compiling x86_64)

pull/664/head
Alexander Gessler 2015-04-17 06:42:58 +02:00
parent d12868adc4
commit f435712273
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/ObjFileMtlImporter.cpp
View File

@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
#include <stdlib.h>
#include "ObjFileMtlImporter.h" #include "ObjFileMtlImporter.h"
#include "ObjTools.h" #include "ObjTools.h"
#include "ObjFileData.h" #include "ObjFileData.h"

4
code/Q3BSPZipArchive.cpp
View File

@ -140,11 +140,11 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) {
ZipFile::ZipFile(size_t size) : m_Size(size) { ZipFile::ZipFile(size_t size) : m_Size(size) {
ai_assert(m_Size != 0); ai_assert(m_Size != 0);
m_Buffer = std::malloc(m_Size); m_Buffer = malloc(m_Size);
} }
ZipFile::~ZipFile() { ZipFile::~ZipFile() {
std::free(m_Buffer); free(m_Buffer);
m_Buffer = NULL; m_Buffer = NULL;
} }