Fixed compilation issues with mingw

2015-04-28 15:16:53 +02:00 · 2015-04-28 15:16:53 +02:00 · d809ca98c1
parent 91c751a03a
commit d809ca98c1
1 changed files with 5 additions and 5 deletions
--- a/tools/assimp_view/assimp_view.h
+++ b/tools/assimp_view/assimp_view.h
@ -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

 // in order for std::min and std::max to behave properly
-/*#ifdef min 
-#undef min
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif // max
+#ifndef min
+#define min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif // min
-#ifdef max 
-#undef max
-#endif // min*/

 #include <time.h>