From 0a25cfe69d3c6f04d3d0a779549f126731aa4964 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Sun, 1 Mar 2015 19:44:46 -0800
Subject: Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.

Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
---
 src/google/protobuf/arena.cc | 2 +-
 src/google/protobuf/arena.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 src/google/protobuf/arena.cc

diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc
old mode 100644
new mode 100755
index e9ee6170..bda37413
--- a/src/google/protobuf/arena.cc
+++ b/src/google/protobuf/arena.cc
@@ -44,7 +44,7 @@ Arena::ThreadCache& Arena::thread_cache() {
   return thread_cache_;
 }
 #else
-__thread Arena::ThreadCache Arena::thread_cache_ = { -1, NULL };
+GOOGLE_THREAD_LOCAL Arena::ThreadCache Arena::thread_cache_ = { -1, NULL };
 #endif
 
 void Arena::Init() {
diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h
index a83a4fbf..bb15e80c 100644
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@@ -374,7 +374,7 @@ class LIBPROTOBUF_EXPORT Arena {
   // wrap them in static functions.
   static ThreadCache& thread_cache();
 #else
-  static __thread ThreadCache thread_cache_;
+  static GOOGLE_THREAD_LOCAL ThreadCache thread_cache_;
   static ThreadCache& thread_cache() { return thread_cache_; }
 #endif
 
-- 
cgit v1.2.3