Merge pull request #823 from ricnewton/master

Define NOMINMAN to fix windows build.

Merge pull request #823 from ricnewton/master
Define NOMINMAN to fix windows build.
f253fe5f · Pieter Hintjens · d981d016 · bf06f3bb · f253fe5f
Commit f253fe5f authored Jan 14, 2014 by Pieter Hintjens
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

windows.hpp src/windows.hpp +3 -0

No files found.
--- a/src/windows.hpp
+++ b/src/windows.hpp
@@ -23,6 +23,9 @@
 #ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
 #endif
+#ifndef NOMINMAX
+#define NOMINMAX          // Macros min(a,b) and max(a,b)
+#endif

 //  Set target version to Windows Server 2003, Windows XP/SP1 or higher.
 #ifndef _WIN32_WINNT