From 203bb5eb33fca8d848c18e62a83d97b22bb08a79 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Thu, 31 Mar 2016 17:38:11 -0700
Subject: Fix re-definition issue of winsock.h and winsock2.h

---
 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 cfb3d001..195971b5 100644
--- a/src/google/protobuf/map_test.cc
+++ b/src/google/protobuf/map_test.cc
@@ -31,6 +31,7 @@
 // A hack to include windows.h first, which ensures the GetMessage macro can
 // be undefined when we include <google/protobuf/stubs/common.h>
 #if defined(_WIN32)
+#define _WINSOCKAPI_  // to avoid re-definition in WinSock2.h
 #include <windows.h>
 #endif  // _WIN32
 
-- 
cgit v1.2.3