X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=libustcomm%2Fustcomm.h;fp=libustcomm%2Fustcomm.h;h=a91c111e8d7d02d1a1e69028f1e31b7f18744324;hp=995295810a5fc80ee4f8fcd1cae87618ed821a03;hb=b521931e0000388ff9080d46719936be98af54c6;hpb=ad5c7b826145e951950bd1afa6fce17ea193bb48

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index 9952958..a91c111 100644
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -105,10 +105,10 @@ struct ustcomm_buffer_info {
 	char data[USTCOMM_DATA_SIZE];
 };
 
-struct ustcomm_marker_info {
+struct ustcomm_ust_marker_info {
 	char *trace;
 	char *channel;
-	char *marker;
+	char *ust_marker;
 	char data[USTCOMM_DATA_SIZE];
 };
 
@@ -202,12 +202,12 @@ extern int ustcomm_pack_buffer_info(struct ustcomm_header *header,
 
 extern int ustcomm_unpack_buffer_info(struct ustcomm_buffer_info *buf_inf);
 
-extern int ustcomm_pack_marker_info(struct ustcomm_header *header,
-				    struct ustcomm_marker_info *marker_inf,
+extern int ustcomm_pack_ust_marker_info(struct ustcomm_header *header,
+				    struct ustcomm_ust_marker_info *ust_marker_inf,
 				    const char *trace,
 				    const char *channel,
-				    const char *marker);
+				    const char *ust_marker);
 
-extern int ustcomm_unpack_marker_info(struct ustcomm_marker_info *marker_inf);
+extern int ustcomm_unpack_ust_marker_info(struct ustcomm_ust_marker_info *ust_marker_inf);
 
 #endif /* USTCOMM_H */