diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-03-31 17:38:11 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-03-31 17:38:11 -0700 |
| commit | 203bb5eb33fca8d848c18e62a83d97b22bb08a79 (patch) | |
| tree | 9308d878ab33dec555a5e0fe0a0dfc799a83854f /src | |
| parent | 1bf446c71e2f3c71e70ece2b97e8975084bf521b (diff) | |
Fix re-definition issue of winsock.h and winsock2.h
Diffstat (limited to 'src')
| -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 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 |