generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-11-01 11:52:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #172 from bajamircea/master

Browse Source 
Added check for already defined NOMINMAX
This commit is contained in:
Takatoshi Kondo
2014-12-09 22:40:36 +09:00
parent 1a615af437 6e560e345a
commit 2d61fdf865
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/msgpack/unpack.hpp
View File

@@ -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