fix: allocating C++ compound literal on heap with Clang

[lttng-ust.git] / include / lttng / ust-compiler.h

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index 674b519cd11991ee4a04b42abdb081e86d2d7843..eb201bdc93c791f142d2cbc0aa7a86fd90d2472d 100644 (file)
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -32,8 +32,8 @@
  * 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