Tracepoint API namespacing ust-endian

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

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 8fa73ce7a55a34f5dcbd0b2179a91b8847cda934..268271c48c933fe8be2f1df6f5c4a8d5b8d81c91 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -609,7 +609,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  * An example:
  *
  * LTTNG_UST_TRACEPOINT_ENUM(someproject_component, enumname,
- *     TP_ENUM_VALUES(
+ *     LTTNG_UST_TP_ENUM_VALUES(
  *             ctf_enum_value("even", 0)
  *             ctf_enum_value("uneven", 1)
  *             ctf_enum_range("twoto4", 2, 4)
@@ -619,7 +619,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *
  * Where "someproject_component" is the name of the component this enumeration
  * belongs to and "enumname" identifies this enumeration. Inside the
- * TP_ENUM_VALUES macro is the actual mapping. Each string value can map
+ * LTTNG_UST_TP_ENUM_VALUES macro is the actual mapping. Each string value can map
  * to either a single value with ctf_enum_value or a range of values
  * with ctf_enum_range.
  *
@@ -815,7 +815,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *      LTTNG_UST_TRACEPOINT_LOGLEVEL(< [com_company_]project[_component] >, < event >,
  *              < loglevel_name >)
  *
- * The TRACEPOINT_PROVIDER must be already declared before declaring a
+ * The LTTNG_UST_TRACEPOINT_PROVIDER must be already declared before declaring a
  * LTTNG_UST_TRACEPOINT_LOGLEVEL.
  */
 
@@ -861,8 +861,12 @@ enum {
 
 #endif /* #ifndef LTTNG_UST_TRACEPOINT_LOGLEVEL */
 
-#ifndef TRACEPOINT_MODEL_EMF_URI
+#ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
 
-#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
-#endif /* #ifndef TRACEPOINT_MODEL_EMF_URI */
+#if LTTNG_UST_COMPAT_API(0)
+#define TRACEPOINT_MODEL_EMF_URI LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#endif
+
+#endif /* #ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI */