commit 8c29dc2c4d55bb620bfe15ca6b74f8097cbb006d
author Alisa <segistration@gmail.com> Wed Dec 15 00:45:13 2021 +0800
committer GitHub <noreply@github.com> Tue Dec 14 08:45:13 2021 -0800
tree 13a617c57c03d9ae79a5c092b9b437df0184e4b9
parent 29b3d01572d50c0e5bc0ab2eea32f9779c7576f4

Fix broken max macro on Windows (#9273)

src/google/protobuf/arena.h

diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h
index 6dd6467..785f273 100644
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@@ -37,9 +37,6 @@
 #include <limits>
 #include <type_traits>
 #include <utility>
-#ifdef max
-#undef max  // Visual Studio defines this macro
-#endif
 #if defined(_MSC_VER) && !defined(_LIBCPP_STD_VER) && !_HAS_EXCEPTIONS
 // Work around bugs in MSVC <typeinfo> header when _HAS_EXCEPTIONS=0.
 #include <exception>

src/google/protobuf/stubs/stl_util.h

diff --git a/src/google/protobuf/stubs/stl_util.h b/src/google/protobuf/stubs/stl_util.h
index 45d2890..ef66305 100644
--- a/src/google/protobuf/stubs/stl_util.h
+++ b/src/google/protobuf/stubs/stl_util.h
@@ -37,6 +37,8 @@
 
 #include <algorithm>
 
+#include <google/protobuf/port_def.inc>
+
 namespace google {
 namespace protobuf {
 
@@ -82,4 +84,6 @@
 }  // namespace protobuf
 }  // namespace google
 
+#include <google/protobuf/port_undef.inc>
+
 #endif  // GOOGLE_PROTOBUF_STUBS_STL_UTIL_H__