Tracepoint API namespacing ust-endian

[lttng-ust.git] / src / common / events.h

diff --git a/src/common/events.h b/src/common/events.h
index bf3367b7528d58c851e8a520b2edd28de06a38fb..5fdec87092074907492398d15c0eb03405158c1c 100644 (file)
--- a/src/common/events.h
+++ b/src/common/events.h
@@ -253,7 +253,7 @@ struct lttng_transport {
        const char *name;
        struct cds_list_head node;
        struct lttng_ust_channel_buffer_ops ops;
-       const struct lttng_ust_lib_ring_buffer_config *client_config;
+       const struct lttng_ust_ring_buffer_config *client_config;
 };
 
 struct lttng_counter_transport {
@@ -389,7 +389,7 @@ struct lttng_ust_channel_buffer_private {
        unsigned int id;                        /* Channel ID */
        enum lttng_ust_abi_chan_type type;
        struct lttng_ust_ctx *ctx;
-       struct lttng_ust_lib_ring_buffer_channel *rb_chan;      /* Ring buffer channel */
+       struct lttng_ust_ring_buffer_channel *rb_chan;  /* Ring buffer channel */
        unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
 };
 
@@ -442,7 +442,7 @@ struct lttng_ust_registered_probe {
 struct lttng_ust_ctx_field {
        const struct lttng_ust_event_field *event_field;
        size_t (*get_size)(void *priv, size_t offset);
-       void (*record)(void *priv, struct lttng_ust_lib_ring_buffer_ctx *ctx,
+       void (*record)(void *priv, struct lttng_ust_ring_buffer_ctx *ctx,
                       struct lttng_ust_channel_buffer *chan);
        void (*get_value)(void *priv, struct lttng_ust_ctx_value *value);
        void (*destroy)(void *priv);
@@ -514,7 +514,7 @@ const struct lttng_ust_type_struct *lttng_ust_get_type_struct(const struct lttng
                .size = (_size),                                                                        \
                .alignment = (_alignment),                                                              \
                .signedness = (_signedness),                                                            \
-               .reverse_byte_order = (_byte_order) != BYTE_ORDER,                                      \
+               .reverse_byte_order = (_byte_order) != LTTNG_UST_BYTE_ORDER,                                    \
                .base = (_base),                                                                        \
        }))
 
@@ -529,7 +529,7 @@ const struct lttng_ust_type_struct *lttng_ust_get_type_struct(const struct lttng
                .encoding = lttng_ust_string_encoding_UTF8,                                             \
                .elem_type = lttng_ust_static_type_integer(sizeof(char) * CHAR_BIT,                     \
                                lttng_ust_rb_alignof(char) * CHAR_BIT, lttng_ust_is_signed_type(char),  \
-                               BYTE_ORDER, 10),                                                        \
+                               LTTNG_UST_BYTE_ORDER, 10),                                                      \
        }))
 
 #define lttng_ust_static_event_field(_name, _type, _nowrite, _nofilter)                                        \