Internal Code Change

COPYBARA_INTEGRATE_REVIEW=#12936 from be-hase:issue-12810 f4df5b5 FUTURE_COPYBARA_INTEGRATE_REVIEW=#12936 from be-hase:issue-12810 f4df5b5 PiperOrigin-RevId: 540993846
protocolbuffers · Jun 20, 2023 · 4c296d1 · 4c296d1
1 parent 4567683
commit 4c296d1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
@@ -66,6 +66,11 @@
         <artifactId>protobuf-java-util</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-kotlin</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -939,6 +939,8 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 // Windows declares several inconvenient macro names.  We #undef them and then
 // restore them in port_undef.inc.
 #ifdef _WIN32
+#pragma push_macro("CompareString")
+#undef CompareString
 #pragma push_macro("CREATE_NEW")
 #undef CREATE_NEW
 #pragma push_macro("DELETE")

diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
@@ -144,6 +144,7 @@
 #endif
 
 #ifdef _WIN32
+#pragma pop_macro("CompareString")
 #pragma pop_macro("CREATE_NEW")
 #pragma pop_macro("DELETE")
 #pragma pop_macro("DOUBLE_CLICK")

diff --git a/src/google/protobuf/util/field_comparator.cc b/src/google/protobuf/util/field_comparator.cc
@@ -44,6 +44,9 @@
 #include "absl/log/absl_log.h"
 #include "google/protobuf/util/message_differencer.h"
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 namespace google {
 namespace protobuf {
 namespace util {
@@ -245,3 +248,5 @@ FieldComparator::ComparisonResult SimpleFieldComparator::ResultFromBoolean(
 }  // namespace util
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"