From 6ed3b558d24281030ee08354fd48b0ed3201f591 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Wed, 15 Mar 2023 12:11:11 -0700
Subject: [PATCH] Internal changes

PiperOrigin-RevId: 516893867
---
 src/google/protobuf/descriptor.cc | 2 +-
 src/google/protobuf/port_def.inc  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
index 25c212e636..f2401ef691 100644
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@@ -4993,7 +4993,7 @@ static void PlanAllocationSize(const FileDescriptorProto& proto,
   alloc.PlanArray<FileDescriptor>(1);
   alloc.PlanArray<FileDescriptorTables>(1);
   alloc.PlanArray<std::string>(2
-  );  // name + package
+  );    // name + package
   if (proto.has_options()) alloc.PlanArray<FileOptions>(1);
   if (proto.has_source_code_info()) alloc.PlanArray<SourceCodeInfo>(1);
 
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 8767649575..7e0310e01f 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -221,6 +221,10 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
 // Owner: ezb@
 #define PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API 1
 
+// Used to remove Protobuf editions feature.
+// Owner: mkruskal@
+#define PROTOBUF_FUTURE_EDITIONS 1
+
 #endif
 
 #ifdef PROTOBUF_VERSION