Rename __LTTNG_COMPOUND_LITERAL to LTTNG_UST_COMPOUND_LITERAL

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

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index f0ec8d0c41d86a73304f3a23b495840168d12537..475caa30ea11131e7bfd607ecc6419708d5e0a23 100644 (file)
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -48,12 +48,12 @@
  * 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__
+#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,7 +66,7 @@
  *   be used as a typedef name.
  */
 #if defined (__cplusplus) || __STDC_VERSION__ >= 201112L
-#define lttng_static_assert(predicate, msg, c_identifier_msg)  \
+#define lttng_ust_static_assert(predicate, msg, c_identifier_msg)  \
        static_assert(predicate, msg)
 #else
 /*
@@ -79,8 +79,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 */