From 93811ca9f78115a0fd59b3efa047fd8abf5ff602 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Fri, 1 Apr 2016 15:55:49 -0700
Subject: 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 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
 
-- 
cgit v1.2.3