From 6e560e345a54d4edf49240a21375e355bddd2fce Mon Sep 17 00:00:00 2001 From: Mircea Baja Date: Mon, 8 Dec 2014 21:36:26 +0000 Subject: [PATCH] Added check for already defined NOMINMAX --- include/msgpack/unpack.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msgpack/unpack.hpp b/include/msgpack/unpack.hpp index d539179e..3ba9c2a1 100644 --- a/include/msgpack/unpack.hpp +++ b/include/msgpack/unpack.hpp @@ -30,7 +30,9 @@ #if defined(_MSC_VER) // avoiding confliction std::max, std::min, and macro in windows.h +#ifndef NOMINMAX #define NOMINMAX +#endif #endif // defined(_MSC_VER) #ifdef _msgpack_atomic_counter_header