Fix: static_assert unavailable with glibc < 2.16

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

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index dcc72594858060a7a32aec36fb9a2cc19e89dfa0..674b519cd11991ee4a04b42abdb081e86d2d7843 100644 (file)
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -11,7 +11,6 @@
 #include <assert.h>
 
 #define lttng_ust_notrace __attribute__((no_instrument_function))
-#define LTTNG_PACKED   __attribute__((__packed__))
 
 /*
  * Clang supports the no_sanitize variable attribute on global variables.
@@ -35,8 +34,8 @@
  */
 #if defined (__cplusplus) && defined (__GNUC__) && \
        (__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8))
-# ifndef LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
-#  define LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
+# ifndef LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
+#  define LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
 # endif
 #endif
 
@@ -45,16 +44,16 @@
  * Compound literals are part of the C99 and C11 standards, but not
  * part of the C++ standards. However, those are supported by both g++ and
  * clang. In order to be strictly C++11 compliant, defining
- * LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP before including this header
+ * LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP before including this header
  * allocates those on the heap in C++.
  *
  * Example use:
- * static struct mystruct *var = __LTTNG_COMPOUND_LITERAL(struct mystruct, { 1, 2, 3 });
+ * static struct mystruct *var = LTTNG_UST_COMPOUND_LITERAL(struct mystruct, { 1, 2, 3 });
  */
-#if defined (__cplusplus) && defined (LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP)
-#define __LTTNG_COMPOUND_LITERAL(type, ...)    new (type) __VA_ARGS__
+#if defined (__cplusplus) && defined (LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP)
+#define LTTNG_UST_COMPOUND_LITERAL(type, ...)  new (type) __VA_ARGS__
 #else
-#define __LTTNG_COMPOUND_LITERAL(type, ...)    (type[]) { __VA_ARGS__ }
+#define LTTNG_UST_COMPOUND_LITERAL(type, ...)  (type[]) { __VA_ARGS__ }
 #endif
 
 /*
@@ -66,9 +65,12 @@
  *   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
-#define lttng_static_assert(predicate, msg, c_identifier_msg)  \
+#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.
@@ -80,8 +82,8 @@
  * of negative size which is invalid in C and forces a compiler error. The msg
  * parameter is used in the tentative typedef so it is printed to the user.
  */
-#define lttng_static_assert(predicate, msg, c_identifier_msg)  \
-    typedef char lttng_static_assert_##c_identifier_msg[2*!!(predicate)-1];
+#define lttng_ust_static_assert(predicate, msg, c_identifier_msg)  \
+    typedef char lttng_ust_static_assert_##c_identifier_msg[2*!!(predicate)-1]
 #endif
 
 #endif /* _LTTNG_UST_COMPILER_H */