From 999bef7c8dd1736ae234180de71ae96862149c24 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Sat, 9 Mar 2013 08:39:09 +0100 Subject: [PATCH] Add definition to avoid redefinition of min() and max() macros when including windows.h on Windows --- src/engine/Timer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/engine/Timer.h b/src/engine/Timer.h index 383cb9e2..075d6732 100644 --- a/src/engine/Timer.h +++ b/src/engine/Timer.h @@ -34,6 +34,7 @@ #include "../configuration.h" #if defined(WINDOWS_OS) // For Windows platform + #define NOMINMAX // This is used to avoid definition of max() and min() macros #include #else // For Mac OS or Linux platform #include