X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=e28c20bf1c397c28384126c849564cde0b27d833;hb=6e5e3c512dd7c4ead8ce89bff2de1a56a6d5e360;hp=7b381b2c75db6c7300cc6581206e0e12b1f5c0fa;hpb=b1316da1ffbd276fc8271e7a9438e683ad352781;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 7b381b2c7..e28c20bf1 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -96,7 +96,7 @@ enum sync_metadata_status {
 	SYNC_METADATA_STATUS_ERROR,
 };
 
-extern struct lttng_consumer_global_data consumer_data;
+extern struct lttng_consumer_global_data the_consumer_data;
 
 struct stream_list {
 	struct cds_list_head head;
@@ -160,7 +160,7 @@ struct lttng_consumer_channel {
 
 	/* For UST */
 	uid_t ust_app_uid;	/* Application UID. */
-	struct ustctl_consumer_channel *uchan;
+	struct lttng_ust_ctl_consumer_channel *uchan;
 	unsigned char uuid[LTTNG_UUID_STR_LEN];
 	/*
 	 * Temporary stream list used to store the streams once created and waiting
@@ -540,7 +540,7 @@ struct lttng_consumer_stream {
 	/* Stream name. Format is: <channel_name>_<cpu_number> */
 	char name[LTTNG_SYMBOL_NAME_LEN];
 	/* Internal state of libustctl. */
-	struct ustctl_consumer_stream *ustream;
+	struct lttng_ust_ctl_consumer_stream *ustream;
 	struct cds_list_head send_node;
 	/* On-disk circular buffer */
 	uint64_t tracefile_size_current;