Internal change

PiperOrigin-RevId: 998188368

src/google/protobuf/arena.h

diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h
index 7e0833a..6ba0309 100644
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@@ -866,13 +866,12 @@
   }
 
   template <typename T>
-  static auto PROTOBUF_NULLABLE
-  Unpack(const typename Arena::UniquePtr<T>& ptr) {
+  static T* PROTOBUF_NULLABLE Unpack(const typename Arena::UniquePtr<T>& ptr) {
     return ptr.get();
   }
 
   template <typename T>
-  static auto PROTOBUF_NONNULL
+  static T* PROTOBUF_NONNULL
   Unpack(const typename Arena::template Ptr<T>& ptr) {
     return ptr.get();
   }

src/google/protobuf/os_macros_restore.inc

diff --git a/src/google/protobuf/os_macros_restore.inc b/src/google/protobuf/os_macros_restore.inc
index 4d1e3e1..631174c 100644
--- a/src/google/protobuf/os_macros_restore.inc
+++ b/src/google/protobuf/os_macros_restore.inc
@@ -47,6 +47,7 @@
 #pragma pop_macro("ERROR_NOT_FOUND")
 #pragma pop_macro("ERROR_RETRY")
 #pragma pop_macro("ERROR_TIMEOUT")
+#pragma pop_macro("FAR")
 #pragma pop_macro("GetClassName")
 #pragma pop_macro("GetCurrentTime")
 #pragma pop_macro("GetMessage")

src/google/protobuf/os_macros_undef.inc

diff --git a/src/google/protobuf/os_macros_undef.inc b/src/google/protobuf/os_macros_undef.inc
index 985f62a..8d961ae 100644
--- a/src/google/protobuf/os_macros_undef.inc
+++ b/src/google/protobuf/os_macros_undef.inc
@@ -73,6 +73,8 @@
 #undef ERROR_RETRY
 #pragma push_macro("ERROR_TIMEOUT")
 #undef ERROR_TIMEOUT
+#pragma push_macro("FAR")
+#undef FAR
 #pragma push_macro("GetClassName")
 #undef GetClassName
 #pragma push_macro("GetCurrentTime")