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

Fixed compilation issues with mingw

pull/546/head
Léo Terziman 2015-04-28 15:16:53 +02:00
parent 91c751a03a
commit d809ca98c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/assimp_view/assimp_view.h
View File

@ -72,12 +72,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../code/StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp #include "../../code/StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp
// in order for std::min and std::max to behave properly // in order for std::min and std::max to behave properly
/*#ifdef min #ifndef max
#undef min #define max(a,b) (((a) > (b)) ? (a) : (b))
#endif // max
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif // min #endif // min
#ifdef max
#undef max
#endif // min*/
#include <time.h> #include <time.h>