* g++ 4.8 and prior do not support C99 compound literals. Therefore,
* force allocating those on the heap with these C++ compilers.
*/
-#if defined (__cplusplus) && defined (__GNUC__) && \
- (__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8))
+#if defined (__cplusplus) && !defined (__clang__) && defined (__GNUC__) && \
+ ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8)))
# ifndef LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
# define LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
# endif
* static assertion. This parameter must be a valid C identifier as it will
* be used as a typedef name.
*/
-#if defined (__cplusplus) || __STDC_VERSION__ >= 201112L
+#ifdef __cplusplus
#define lttng_ust_static_assert(predicate, msg, c_identifier_msg) \
static_assert(predicate, msg)
+#elif __STDC_VERSION__ >= 201112L
+#define lttng_ust_static_assert(predicate, msg, c_identifier_msg) \
+ _Static_assert(predicate, msg)
#else
/*
* Evaluates the predicate and emit a compilation error on failure.