From 94dfe1368ac1cd4a456c86b8fc800d7c3911cfd3 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Fri, 4 Jun 2010 17:02:16 +0200 Subject: Fix MINGW build Mingw seems to define NOMINMAX, so don't redefine it if already defined --- src/windows.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/windows.hpp b/src/windows.hpp index 35024ba..8fc98b0 100644 --- a/src/windows.hpp +++ b/src/windows.hpp @@ -24,7 +24,9 @@ // on the windows platform. #define _WINSOCKAPI_ -#define NOMINMAX +#ifndef NOMINMAX +#define NOMINMAX // No min and max functions, these clash with C++. +#endif #define _CRT_SECURE_NO_WARNINGS #ifndef WIN32_LEAN_AND_MEAN -- cgit v1.2.3