Skip to content

P
protobuf
Commit 93811ca9 authored by Jisi Liu's avatar Jisi Liu
Browse files
Options

Do not let windows.h define min/max macros

parent 3b6df061
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
src/google/protobuf/map_test.cc
View file @ 93811ca9
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
// be undefined when we include <google/protobuf/stubs/common.h> // be undefined when we include <google/protobuf/stubs/common.h>
#if defined(_WIN32) #if defined(_WIN32)
#define _WINSOCKAPI_ // to avoid re-definition in WinSock2.h #define _WINSOCKAPI_ // to avoid re-definition in WinSock2.h
#define NOMINMAX // to avoid defining min/max macros
#include <windows.h> #include <windows.h>
#endif // _WIN32 #endif // _WIN32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment