From 6517fd2107a5a71290afad8850da0eab51519bc6 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 1 Jun 2017 23:42:24 +0200
Subject: HAVE_THREADSAFE_STATICS sould always be true

...(for LIBO_INTERNAL_ONLY), now that the status of Android has been clarified,
see <https://lists.freedesktop.org/archives/libreoffice/2017-June/077827.html>
"Re: Some baseline thoughts"

Change-Id: Ie9d5444df84c23d48c24b68d9d2ab5322c619858
---
 include/rtl/instance.hxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/rtl/instance.hxx b/include/rtl/instance.hxx
index d1d8d9eaa44e..79d234308b96 100644
--- a/include/rtl/instance.hxx
+++ b/include/rtl/instance.hxx
@@ -25,9 +25,7 @@
 #include <cstddef>
 
 #include <osl/doublecheckedlocking.h>
-#if ! HAVE_THREADSAFE_STATICS
 #include <osl/getglobalmutex.hxx>
-#endif
 
 namespace {
 
@@ -383,7 +381,7 @@ namespace rtl {
               using the outer class
               (the one that derives from this base class)
 */
-#if HAVE_THREADSAFE_STATICS
+#if defined LIBO_INTERNAL_ONLY
 template<typename T, typename Unique>
 class Static {
 public:
@@ -443,7 +441,7 @@ private:
               using the outer class
               (the one that derives from this base class)
 */
-#if HAVE_THREADSAFE_STATICS
+#if defined LIBO_INTERNAL_ONLY
 template<typename T, typename Data, typename Unique>
 class StaticWithArg {
 public:
@@ -525,7 +523,7 @@ private:
     @tparam InitAggregate
               initializer functor class
 */
-#if HAVE_THREADSAFE_STATICS
+#if defined LIBO_INTERNAL_ONLY
 template<typename T, typename InitAggregate>
 class StaticAggregate {
 public:
@@ -590,7 +588,7 @@ public:
               Initializer functor's return type.
               Default is T (common practice).
 */
-#if HAVE_THREADSAFE_STATICS
+#if defined LIBO_INTERNAL_ONLY
 template<typename T, typename InitData,
          typename Unique = InitData, typename Data = T>
 class StaticWithInit {
-- 
cgit