From 13fd045dbb2b4dacea32be162a41d5a4b0d1802f Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 12 Sep 2017 10:32:01 -0700
Subject: Integrated internal changes from Google

---
 src/google/protobuf/arena_impl.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/arena_impl.h')

diff --git a/src/google/protobuf/arena_impl.h b/src/google/protobuf/arena_impl.h
index b7f0c7b6..5fa2475f 100644
--- a/src/google/protobuf/arena_impl.h
+++ b/src/google/protobuf/arena_impl.h
@@ -42,6 +42,8 @@
 #include <google/protobuf/stubs/mutex.h>
 #include <google/protobuf/stubs/type_traits.h>
 
+#include <google/protobuf/stubs/port.h>
+
 namespace google {
 
 namespace protobuf {
@@ -131,7 +133,8 @@ class LIBPROTOBUF_EXPORT ArenaImpl {
     // aligned at a multiple of 8 bytes.
     size_t pos;
     size_t size;  // total size of the block.
-    GOOGLE_ATTRIBUTE_ALWAYS_INLINE size_t avail() const { return size - pos; }
+    GOOGLE_PROTOBUF_ATTRIBUTE_ALWAYS_INLINE
+    size_t avail() const { return size - pos; }
     // data follows
   };
 
-- 
cgit v1.2.3