X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu%2Ftls-compat.h;fp=urcu%2Ftls-compat.h;h=325b01b234c4b5f590742e830a1c3715ad9661e3;hb=9cce461a8bdfeec66d813018fcbeb40b9ce4b729;hp=8ac1ea0615ddc2eb91ee51e9e15b89bd094d4c81;hpb=e47125e0384ad3a37bdd67bf92af66a68b05bccd;p=urcu.git

diff --git a/urcu/tls-compat.h b/urcu/tls-compat.h
index 8ac1ea0..325b01b 100644
--- a/urcu/tls-compat.h
+++ b/urcu/tls-compat.h
@@ -32,7 +32,17 @@
 extern "C" {
 #endif
 
-#ifdef CONFIG_RCU_TLS	/* Based on ax_tls.m4 */
+#ifdef CONFIG_RCU_TLS
+
+#if defined (__cplusplus) && (__cplusplus >= 201103L)
+# define URCU_TLS_STORAGE_CLASS	thread_local
+#elif defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
+# define URCU_TLS_STORAGE_CLASS	_Thread_local
+#elif defined (_MSC_VER)
+# define URCU_TLS_STORAGE_CLASS	__declspec(thread)
+#else
+# define URCU_TLS_STORAGE_CLASS	__thread
+#endif
 
 /*
  * Hint: How to define/declare TLS variables of compound types
@@ -65,10 +75,10 @@ extern "C" {
  */
 
 # define DECLARE_URCU_TLS(type, name)	\
-	CONFIG_RCU_TLS type name
+	URCU_TLS_STORAGE_CLASS type name
 
 # define DEFINE_URCU_TLS(type, name)	\
-	CONFIG_RCU_TLS type name
+	URCU_TLS_STORAGE_CLASS type name
 
 # define URCU_TLS(name)		(name)