From 93811ca9f78115a0fd59b3efa047fd8abf5ff602 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Fri, 1 Apr 2016 15:55:49 -0700 Subject: [PATCH] Do not let windows.h define min/max macros --- src/google/protobuf/map_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index 195971b56..e833699ac 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -32,6 +32,7 @@ // be undefined when we include #if defined(_WIN32) #define _WINSOCKAPI_ // to avoid re-definition in WinSock2.h +#define NOMINMAX // to avoid defining min/max macros #include #endif // _WIN32