X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fust-compiler.h;h=b7fd2c1c42bff2bac5d6bfc1c4f403a61fa82234;hb=3615ef97a1075d302b5faad557154785135b7eb7;hp=c938361d496ed84e1b924f0e69da489b8e3893f9;hpb=05bfa3dc3a6e6b2ece3686a5f384b6645c2a5010;p=lttng-ust.git

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index c938361d..b7fd2c1c 100644
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -68,7 +68,7 @@
 #ifdef __cplusplus
 #define lttng_ust_static_assert(predicate, msg, c_identifier_msg)  \
 	static_assert(predicate, msg)
-#elif __STDC_VERSION__ >= 201112L
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 #define lttng_ust_static_assert(predicate, msg, c_identifier_msg)  \
 	_Static_assert(predicate, msg)
 #else
@@ -86,6 +86,11 @@
     typedef char lttng_ust_static_assert_##c_identifier_msg[2*!!(predicate)-1]
 #endif
 
+/* Combine two tokens. */
+#define LTTNG_UST_COMPILER__COMBINE_TOKENS(_tokena, _tokenb)			\
+		_tokena##_tokenb
+#define LTTNG_UST_COMPILER_COMBINE_TOKENS(_tokena, _tokenb)			\
+		LTTNG_UST_COMPILER__COMBINE_TOKENS(_tokena, _tokenb)
 /*
  * Wrap constructor and destructor functions to invoke them as functions with
  * the constructor/destructor GNU C attributes when building as C, or as the
@@ -93,48 +98,48 @@
  * when building as C++.
  */
 #ifdef __cplusplus
-#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func,        \
-						 destructor_func, ...)          \
-namespace lttng {                                                               \
-namespace ust {                                                                 \
-namespace details {                                                             \
-class LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_destructor_,           \
-				   name) {                                      \
-public:                                                                         \
-	LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_destructor_,         \
-				     name)() __VA_ARGS__        \
-	{                                                                       \
-		constructor_func();                                             \
-	}                                                                       \
-	~LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_destructor_,        \
-                                      name)() __VA_ARGS__       \
-	{                                                                       \
-		destructor_func();                                              \
-	}                                                                       \
-};                                                                              \
-}                                                                               \
-}                                                                               \
-}                                                                               \
-                                                                                \
-namespace {                                                                     \
-const lttng::ust::details::LTTNG_UST__TP_COMBINE_TOKENS(                        \
-	lttng_ust_constructor_destructor_, name)                                \
-		LTTNG_UST__TP_COMBINE_TOKENS(name, registration_instance);      \
+#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func,	\
+						 destructor_func, ...)		\
+namespace lttng {								\
+namespace ust {									\
+namespace details {								\
+class LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_,      \
+				   name) {					\
+public:										\
+	LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() __VA_ARGS__; \
+	~LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() __VA_ARGS__; \
+};										\
+LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)::LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() \
+{										\
+	constructor_func();							\
+}										\
+LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)::~LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() \
+{										\
+	destructor_func();							\
+}										\
+}										\
+}										\
+}										\
+										\
+namespace {									\
+const lttng::ust::details::LTTNG_UST_COMPILER_COMBINE_TOKENS(			\
+	lttng_ust_constructor_destructor_, name)				\
+		LTTNG_UST_COMPILER_COMBINE_TOKENS(name, registration_instance); \
 }
 #else /* __cplusplus */
-#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func,             \
-						 destructor_func, ...)               \
-	static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \
-		__attribute__((constructor)) __VA_ARGS__;            \
-	static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \
-	{                                                                            \
-		constructor_func();                                                  \
-	}                                                                            \
-	static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_destructor_, name)(void)  \
-		__attribute__((destructor)) __VA_ARGS__;             \
-	static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_destructor_, name)(void)  \
-	{                                                                            \
-		destructor_func();                                                   \
+#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func,	\
+						 destructor_func, ...)		\
+	static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \
+		__attribute__((constructor)) __VA_ARGS__;			\
+	static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \
+	{									\
+		constructor_func();						\
+	}									\
+	static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_destructor_, name)(void) \
+		__attribute__((destructor)) __VA_ARGS__;			\
+	static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_destructor_, name)(void) \
+	{									\
+		destructor_func();						\
 	}
 #endif