feat: workaround for DOMAIN macro (#12903)

This is a macro on some (older) versions of GCC, and macOS, and Windows. Sigh. I moved the `#undef` block to a common section. I also took the opportunity to add a regression test for all these macros that need to be `#undef`'d. Part of the work for googleapis/google-cloud-cpp#8125 Closes #12903 PiperOrigin-RevId: 535649278
protocolbuffers · May 26, 2023 · 9c479e8 · 9c479e8
1 parent 8ef9357
commit 9c479e8
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 66 deletions.
diff --git a/objectivec/GPBAny.pbobjc.m b/objectivec/GPBAny.pbobjc.m
diff --git a/objectivec/GPBApi.pbobjc.m b/objectivec/GPBApi.pbobjc.m
diff --git a/objectivec/GPBDuration.pbobjc.m b/objectivec/GPBDuration.pbobjc.m
diff --git a/objectivec/GPBEmpty.pbobjc.m b/objectivec/GPBEmpty.pbobjc.m
diff --git a/objectivec/GPBFieldMask.pbobjc.m b/objectivec/GPBFieldMask.pbobjc.m
diff --git a/objectivec/GPBSourceContext.pbobjc.m b/objectivec/GPBSourceContext.pbobjc.m
diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m
diff --git a/objectivec/GPBTimestamp.pbobjc.m b/objectivec/GPBTimestamp.pbobjc.m
diff --git a/objectivec/GPBType.pbobjc.m b/objectivec/GPBType.pbobjc.m
diff --git a/objectivec/GPBWrappers.pbobjc.m b/objectivec/GPBWrappers.pbobjc.m
diff --git a/src/file_lists.cmake b/src/file_lists.cmake
@@ -671,6 +671,7 @@ set(protobuf_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena_lite.proto
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_bad_macros.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_lite.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_optional.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_retention.proto

diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
@@ -659,6 +659,7 @@ filegroup(
         "unittest_proto3.proto",
         "unittest_proto3_arena.proto",
         "unittest_proto3_arena_lite.proto",
+        "unittest_proto3_bad_macros.proto",
         "unittest_proto3_lite.proto",
         "unittest_proto3_optional.proto",
         "unittest_retention.proto",
@@ -716,6 +717,7 @@ proto_library(
         "unittest_proto3.proto",
         "unittest_proto3_arena.proto",
         "unittest_proto3_arena_lite.proto",
+        "unittest_proto3_bad_macros.proto",
         "unittest_proto3_lite.proto",
         "unittest_proto3_optional.proto",
         "unittest_retention.proto",

diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -887,20 +887,20 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #undef PACKAGE
 #endif
 
-// autoheader defines this in some circumstances
-#ifdef PACKAGE
-#define PROTOBUF_DID_UNDEF_PACKAGE
-#pragma push_macro("PACKAGE")
-#undef PACKAGE
-#endif
-
 // a few common headers define this
 #ifdef PACKED
 #define PROTOBUF_DID_UNDEF_PACKED
 #pragma push_macro("PACKED")
 #undef PACKED
 #endif
 
+// This is a macro on Windows, macOS, and some variants of GCC.
+#ifdef DOMAIN
+#define PROTOBUF_DID_UNDEF_DOMAIN
+#pragma push_macro("DOMAIN")
+#undef DOMAIN
+#endif
+
 // linux is a legacy MACRO defined in most popular C++ standards.
 #ifdef linux
 #pragma push_macro("linux")
@@ -915,8 +915,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #undef CREATE_NEW
 #pragma push_macro("DELETE")
 #undef DELETE
-#pragma push_macro("DOMAIN")
-#undef DOMAIN
 #pragma push_macro("DOUBLE_CLICK")
 #undef DOUBLE_CLICK
 #pragma push_macro("ERROR")
@@ -974,9 +972,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #endif  // _WIN32
 
 #ifdef __APPLE__
-// Inconvenient macro names from usr/include/math.h in some macOS SDKs.
-#pragma push_macro("DOMAIN")
-#undef DOMAIN
 // Inconvenient macro names from /usr/include/mach/boolean.h in some macOS SDKs.
 #pragma push_macro("TRUE")
 #undef TRUE