From a40ac4eace7c8e2acdf3d0413f374e75a50241bc Mon Sep 17 00:00:00 2001 From: DarkGuru Date: Wed, 4 Jun 2008 17:50:39 +0000 Subject: [PATCH] Some fixes for build with MinGW git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@55 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- include/aiMaterial.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/aiMaterial.inl b/include/aiMaterial.inl index 52145084b..117178e6a 100644 --- a/include/aiMaterial.inl +++ b/include/aiMaterial.inl @@ -95,7 +95,7 @@ inline aiReturn aiMaterialCPP::Get(const char* pKey,Type* pOut, if ( AI_SUCCESS == ret ) { if (prop->mDataLength < sizeof(Type)*iNum)return AI_FAILURE; - if (prop->mData != aiPTI_Buffer)return AI_FAILURE; + if (strcmp(prop->mData,(char*)aiPTI_Buffer)!=0)return AI_FAILURE; iNum = std::min(iNum,prop->mDataLength / sizeof(Type)); ::memcpy(pOut,prop->mData,iNum * sizeof(Type)); @@ -112,7 +112,7 @@ inline aiReturn aiMaterialCPP::Get(const char* pKey,Type& pOut) if ( AI_SUCCESS == ret ) { if (prop->mDataLength < sizeof(Type))return AI_FAILURE; - if (prop->mData != aiPTI_Buffer)return AI_FAILURE; + if (strcmp(prop->mData,(char*)aiPTI_Buffer)!=0)return AI_FAILURE; ::memcpy(&pOut,prop->mData,sizeof(Type)); }