Do not let windows.h define min/max macros

93811ca9 · Jisi Liu · 3b6df061 · 93811ca9
Commit 93811ca9 authored Apr 01, 2016 by Jisi Liu
Show 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
@@ -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