Fix re-definition issue of winsock.h and winsock2.h

203bb5eb · Jisi Liu · 1bf446c7 · 203bb5eb
Commit 203bb5eb authored Apr 01, 2016 by Jisi Liu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

map_test.cc src/google/protobuf/map_test.cc +1 -0

No files found.
--- 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