cleanup: Namespace public utils macros

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 96504940ec3669941dff17ec0a7753d45f230ddd..8b45cb7f89ac2e2088f0ad01f48201f52fb77b13 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -124,7 +124,7 @@ struct lttng_ust_type_integer {
                .struct_size = sizeof(struct lttng_ust_type_integer),   \
                .size = sizeof(_type) * CHAR_BIT,                       \
                .alignment = lttng_alignof(_type) * CHAR_BIT,           \
-               .signedness = lttng_is_signed_type(_type),              \
+               .signedness = lttng_ust_is_signed_type(_type),          \
                .reverse_byte_order = _byte_order != BYTE_ORDER,        \
                .base = _base,                                          \
        }))
@@ -258,7 +258,8 @@ struct lttng_ust_event_field {
 struct lttng_ust_event_desc {
        uint32_t struct_size;                   /* Size of this structure. */
 
-       const char *name;
+       const char *event_name;
+       struct lttng_ust_probe_desc *probe_desc;
        void (*probe_callback)(void);
        struct lttng_event_ctx *ctx;            /* context */
        struct lttng_ust_event_field **fields;  /* event payload */
@@ -282,7 +283,7 @@ struct lttng_ust_event_desc {
 struct lttng_ust_probe_desc {
        uint32_t struct_size;                   /* Size of this structure. */
 
-       const char *provider;
+       const char *provider_name;
        struct lttng_ust_event_desc **event_desc;
        unsigned int nr_events;
        struct cds_list_head head;              /* chain registered probes */