From 47357de276fe4fc01469f34c1dbf8b26fdbc1c4b Mon Sep 17 00:00:00 2001
From: "Vicente J. Botet Escriba" <vicente.botet@wanadoo.fr>
Date: Wed, 23 Mar 2016 23:15:50 +0100
Subject: [PATCH] rollback BOOST_THREAD_PATCH.

---
 src/pthread/once.cpp   | 2 ++
 src/pthread/thread.cpp | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pthread/once.cpp b/src/pthread/once.cpp
index 5292adfe..5deb4aed 100644
--- a/src/pthread/once.cpp
+++ b/src/pthread/once.cpp
@@ -42,6 +42,7 @@ namespace boost
                 }
             }
 
+#if defined BOOST_THREAD_PATCH
             const pthread_once_t pthread_once_init_value=PTHREAD_ONCE_INIT;
             struct BOOST_THREAD_DECL delete_epoch_tss_key_on_dlclose_t
             {
@@ -57,6 +58,7 @@ namespace boost
                 }
             };
             delete_epoch_tss_key_on_dlclose_t delete_epoch_tss_key_on_dlclose;
+#endif
         }
 
         uintmax_atomic_t& get_once_per_thread_epoch()
diff --git a/src/pthread/thread.cpp b/src/pthread/thread.cpp
index 969e58cc..7fd61b12 100644
--- a/src/pthread/thread.cpp
+++ b/src/pthread/thread.cpp
@@ -115,6 +115,7 @@ namespace boost
                 }
             }
 
+#if defined BOOST_THREAD_PATCH
             struct  delete_current_thread_tls_key_on_dlclose_t
             {
                 delete_current_thread_tls_key_on_dlclose_t()
@@ -130,7 +131,7 @@ namespace boost
                 }
             };
             delete_current_thread_tls_key_on_dlclose_t delete_current_thread_tls_key_on_dlclose;
-
+#endif
             void create_current_thread_tls_key()
             {
                 BOOST_VERIFY(!pthread_key_create(&current_thread_tls_key,&tls_destructor));