summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2010-06-04 17:02:16 +0200
committerMartin Lucina <mato@kotelna.sk>2010-06-04 17:02:16 +0200
commit94dfe1368ac1cd4a456c86b8fc800d7c3911cfd3 (patch)
tree49749ab18bc274bf33d97c5b897da800d5953c32
parentcf048bb1f8a665370d9e39aee2a7363327911b08 (diff)
Fix MINGW build
Mingw seems to define NOMINMAX, so don't redefine it if already defined
-rw-r--r--src/windows.hpp4
1 files changed, 3 insertions, 1 deletions
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