X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Ftls-compat.h;h=db22dde6758550cad1dbf329ef050c7916706ffd;hp=c17aca36b2c86a4b94f95e1c97c8aaa327f1f4a7;hb=109267f653502cf5ef5ada5d098167b9726daa2d;hpb=e2b8e1f623338afb1760a8033785f4904c645c86

diff --git a/include/urcu/tls-compat.h b/include/urcu/tls-compat.h
index c17aca3..db22dde 100644
--- a/include/urcu/tls-compat.h
+++ b/include/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,13 +75,13 @@ 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 DEFINE_URCU_TLS_INIT(type, name, init)	\
-	CONFIG_RCU_TLS type name = (init)
+	URCU_TLS_STORAGE_CLASS type name = (init)
 
 # define URCU_TLS(name)		(name)