X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=703bd24cc06d4bb8da1c24655fde73a5dd7ba844;hb=06cd86a02ad70753f9bb3ced36e8ed17a18b0f77;hp=059589f34853eedabf1ae0be447da55d733011d6;hpb=dc177d114989d85bc9d0c9f561632b9ea3a19908;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 059589f3..703bd24c 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -41,10 +41,9 @@ extern "C" {
 #define LTTNG_UST_PROVIDER_MINOR	0
 
 struct lttng_channel;
-struct lttng_session;
+struct lttng_ust_session;
 struct lttng_ust_lib_ring_buffer_ctx;
 struct lttng_ust_event_field;
-struct lttng_event_notifier_group;
 
 /*
  * Data structures used by tracepoint event declarations, and by the
@@ -105,19 +104,17 @@ struct lttng_ust_enum_entry {
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
-#define __type_integer(_type, _byte_order, _base, _encoding)	\
-	{							\
-	  .atype = atype_integer,				\
-	  .u =							\
-		{						\
-		  .integer =					\
-			{					\
-			  .size = sizeof(_type) * CHAR_BIT,	\
-			  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
-			  .signedness = lttng_is_signed_type(_type), \
-			  .reverse_byte_order = _byte_order != BYTE_ORDER, \
-			  .base = _base,			\
-			  .encoding = lttng_encode_##_encoding,	\
+#define __type_integer(_type, _byte_order, _base, _encoding)		\
+	{								\
+		.atype = atype_integer,					\
+		.u = {							\
+			.integer = {					\
+				.size = sizeof(_type) * CHAR_BIT,	\
+				.alignment = lttng_alignof(_type) * CHAR_BIT, \
+				.signedness = lttng_is_signed_type(_type), \
+				.reverse_byte_order = _byte_order != BYTE_ORDER, \
+				.base = _base,			\
+				.encoding = lttng_encode_##_encoding, \
 			}					\
 		},						\
 	}							\
@@ -142,21 +139,19 @@ struct lttng_integer_type {
 		: (sizeof(_type) == sizeof(double) ? DBL_MANT_DIG	\
 		: 0))
 
-#define __type_float(_type)					\
-	{							\
-	  .atype = atype_float,					\
-	  .u =							\
-		{						\
-		  ._float =					\
-			{					\
-			  .exp_dig = sizeof(_type) * CHAR_BIT	\
-					  - _float_mant_dig(_type), \
-			  .mant_dig = _float_mant_dig(_type),	\
-			  .alignment = lttng_alignof(_type) * CHAR_BIT, \
-			  .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,	\
-			}					\
-		}						\
-	}							\
+#define __type_float(_type)						\
+	{								\
+		.atype = atype_float,					\
+		.u = {							\
+			._float = {					\
+				.exp_dig = sizeof(_type) * CHAR_BIT	\
+					- _float_mant_dig(_type),	\
+				.mant_dig = _float_mant_dig(_type),	\
+				.alignment = lttng_alignof(_type) * CHAR_BIT, \
+				.reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,	\
+			}						\
+		}							\
+	}								\
 
 #define LTTNG_UST_FLOAT_TYPE_PADDING	24
 struct lttng_float_type {
@@ -504,7 +499,7 @@ struct lttng_channel {
 	int enabled;
 	struct lttng_ust_ctx *ctx;
 	/* Event ID management */
-	struct lttng_session *session;
+	struct lttng_ust_session *session;
 	int objd;			/* Object associated to channel */
 	struct cds_list_head node;	/* Channel list in session */
 	const struct lttng_ust_channel_ops *ops;
@@ -548,7 +543,7 @@ struct lttng_ust_session_private;
  * structure. It should be queried before using additional fields added
  * at the end of the structure.
  */
-struct lttng_session {
+struct lttng_ust_session {
 	uint32_t struct_size;			/* Size of this structure */
 
 	struct lttng_ust_session_private *priv;	/* Private session interface */