Don't redefine NOMINMAX (clean up MinGW warnings)

2016-02-05 13:35:15 -06:00
parent ef2e6079ba
commit 5c16357fe2
7 changed files with 8 additions and 7 deletions
--- a/src/misc/timer.cpp
+++ b/src/misc/timer.cpp
@@ -8,7 +8,7 @@
 *  @author mrk
 */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif