Internal Change PiperOrigin-RevId: 836477077
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 47cf572..31e29c5 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc
@@ -163,8 +163,6 @@ #endif -#define PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE 1 - #ifdef PROTOBUF_ALWAYS_INLINE #error PROTOBUF_ALWAYS_INLINE was previously defined #endif
diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc index 2dc50f6..97c408d 100644 --- a/src/google/protobuf/port_undef.inc +++ b/src/google/protobuf/port_undef.inc
@@ -67,7 +67,6 @@ #undef PROTOBUF_NO_THREADLOCAL #undef PROTOBUF_NONNULL #undef PROTOBUF_NULLABLE -#undef PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE #undef PROTOBUF_PRESERVE_ALL #undef PROTOBUF_NO_MERGE