From a4b8d25b973c87a709c5c6adf17c6679db29046e Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-team-bot@google.com>
Date: Wed, 4 Sep 2024 17:55:52 +0000
Subject: [PATCH] Auto-generate files after cl/671022293

---
 src/google/protobuf/any.pb.h            | 6 +++---
 src/google/protobuf/api.pb.h            | 6 +++---
 src/google/protobuf/duration.pb.h       | 6 +++---
 src/google/protobuf/empty.pb.h          | 6 +++---
 src/google/protobuf/field_mask.pb.h     | 6 +++---
 src/google/protobuf/source_context.pb.h | 6 +++---
 src/google/protobuf/struct.pb.h         | 6 +++---
 src/google/protobuf/timestamp.pb.h      | 6 +++---
 src/google/protobuf/type.pb.h           | 6 +++---
 src/google/protobuf/wrappers.pb.h       | 6 +++---
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index b489755ef1..c8ceb5d6e9 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/any.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2fany_2eproto_2epb_2eh
+#define google_2fprotobuf_2fany_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -466,4 +466,4 @@ inline void Any::set_allocated_value(std::string* value) {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2fany_2eproto_2epb_2eh
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index bdb42ac2e4..644ce7d7dd 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/api.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2fapi_2eproto_2epb_2eh
+#define google_2fprotobuf_2fapi_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -1635,4 +1635,4 @@ inline void Mixin::set_allocated_root(std::string* value) {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2fapi_2eproto_2epb_2eh
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index 13bc80648e..621cd43c3a 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/duration.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2fduration_2eproto_2epb_2eh
+#define google_2fprotobuf_2fduration_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -342,4 +342,4 @@ inline void Duration::_internal_set_nanos(::int32_t value) {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2fduration_2eproto_2epb_2eh
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index 59298974e5..4a7a64bb97 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/empty.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2fempty_2eproto_2epb_2eh
+#define google_2fprotobuf_2fempty_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -242,4 +242,4 @@ class PROTOBUF_EXPORT Empty final
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2fempty_2eproto_2epb_2eh
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index fbc489454c..d400de2a6b 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/field_mask.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
+#define google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -362,4 +362,4 @@ FieldMask::_internal_mutable_paths() {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index 0c8223baff..7b08aa9947 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/source_context.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
+#define google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -342,4 +342,4 @@ inline void SourceContext::set_allocated_file_name(std::string* value) {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 30e22161d9..92a345070d 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/struct.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2fstruct_2eproto_2epb_2eh
+#define google_2fprotobuf_2fstruct_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -1332,4 +1332,4 @@ inline const EnumDescriptor* GetEnumDescriptor<::google::protobuf::NullValue>()
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2fstruct_2eproto_2epb_2eh
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index 08cf5c788d..e1d7b94422 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/timestamp.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
+#define google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -342,4 +342,4 @@ inline void Timestamp::_internal_set_nanos(::int32_t value) {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 599857856c..4b908eb68d 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/type.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2ftype_2eproto_2epb_2eh
+#define google_2fprotobuf_2ftype_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -3001,4 +3001,4 @@ inline const EnumDescriptor* GetEnumDescriptor<::google::protobuf::Syntax>() {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2ftype_2eproto_2epb_2eh
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index a26591368d..d0fd115231 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -3,8 +3,8 @@
 // source: google/protobuf/wrappers.proto
 // Protobuf C++ Version: 5.29.0-dev
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
+#ifndef google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
+#define google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
@@ -2144,4 +2144,4 @@ inline void BytesValue::set_allocated_value(std::string* value) {
 
 #include "google/protobuf/port_undef.inc"
 
-#endif  // GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
+#endif  // google_2fprotobuf_2fwrappers_2eproto_2epb_2eh