X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=5e94bafeb567789e827a1abfc6e35abe01dd38c7;hb=251c9f75028bda8453a048978ec221b70a652153;hp=2b035d8fa457f2be335cdaa78b157184266070bf;hpb=b5457df5fd74e033cbaa75307f9bbc12aff4ab8f;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 2b035d8f..5e94bafe 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -125,7 +125,7 @@ struct lttng_ust_type_integer {
 		.size = sizeof(_type) * CHAR_BIT,			\
 		.alignment = lttng_ust_rb_alignof(_type) * CHAR_BIT,	\
 		.signedness = lttng_ust_is_signed_type(_type),		\
-		.reverse_byte_order = _byte_order != BYTE_ORDER,	\
+		.reverse_byte_order = _byte_order != LTTNG_UST_BYTE_ORDER,	\
 		.base = _base,						\
 	}))
 
@@ -157,7 +157,7 @@ struct lttng_ust_type_float {
 			- lttng_ust_float_mant_dig(_type),		\
 		.mant_dig = lttng_ust_float_mant_dig(_type),		\
 		.alignment = lttng_ust_rb_alignof(_type) * CHAR_BIT,	\
-		.reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,	\
+		.reverse_byte_order = LTTNG_UST_BYTE_ORDER != LTTNG_UST_FLOAT_WORD_ORDER,	\
 	}))
 
 
@@ -203,8 +203,8 @@ struct lttng_ust_type_struct {
 	struct lttng_ust_type_common parent;
 	uint32_t struct_size;
 	unsigned int nr_fields;
-	const struct lttng_ust_event_field **fields;	/* Array of pointers to fields. */
-	unsigned int alignment;		/* Minimum alignment for this type. */
+	const struct lttng_ust_event_field * const *fields;	/* Array of pointers to fields. */
+	unsigned int alignment;					/* Minimum alignment for this type. */
 };
 
 /*
@@ -223,7 +223,7 @@ struct lttng_ust_enum_desc {
 	uint32_t struct_size;
 
 	const char *name;
-	const struct lttng_ust_enum_entry **entries;
+	const struct lttng_ust_enum_entry * const *entries;
 	unsigned int nr_entries;
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
@@ -268,7 +268,7 @@ struct lttng_ust_event_desc {
 	const char *event_name;
 	const struct lttng_ust_probe_desc *probe_desc;
 	void (*probe_callback)(void);
-	const struct lttng_ust_event_field **fields;	/* event payload */
+	const struct lttng_ust_event_field * const *fields;	/* event payload */
 	unsigned int nr_fields;
 	const int **loglevel;
 	const char *signature;				/* Argument types/names received */
@@ -290,7 +290,7 @@ struct lttng_ust_probe_desc {
 	uint32_t struct_size;			/* Size of this structure. */
 
 	const char *provider_name;
-	const struct lttng_ust_event_desc **event_desc;
+	const struct lttng_ust_event_desc * const *event_desc;
 	unsigned int nr_events;
 	uint32_t major;
 	uint32_t minor;