diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-04-01 15:55:49 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-01 15:55:49 -0700 |
| commit | 93811ca9f78115a0fd59b3efa047fd8abf5ff602 (patch) | |
| tree | 519c68b328699c8d10f2151689afbcf64972f516 | |
| parent | 3b6df0612d10bfeb90914fe5c13840f3968ba76a (diff) | |
| download | protobuf-93811ca9f78115a0fd59b3efa047fd8abf5ff602.tar.gz protobuf-93811ca9f78115a0fd59b3efa047fd8abf5ff602.tar.bz2 protobuf-93811ca9f78115a0fd59b3efa047fd8abf5ff602.zip | |
Do not let windows.h define min/max macros
| -rw-r--r-- | src/google/protobuf/map_test.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index 195971b5..e833699a 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -32,6 +32,7 @@ // be undefined when we include <google/protobuf/stubs/common.h> #if defined(_WIN32) #define _WINSOCKAPI_ // to avoid re-definition in WinSock2.h +#define NOMINMAX // to avoid defining min/max macros #include <windows.h> #endif // _WIN32 |