X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-compiler.h;h=32fd1bb25ed9ddb3a984b3882969c5c72b348f20;hb=1698631bb3fbab41277b3953e193dd2fd4a74afa;hp=f0ec8d0c41d86a73304f3a23b495840168d12537;hpb=9f5ade14faf36df6429d9c6e1d0360854a5669d0;p=lttng-ust.git

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index f0ec8d0c..32fd1bb2 100644
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -34,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
 
@@ -44,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,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 */