X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-dynamic-type.c;h=4147e3a70dec262ee00ec4a5a5a7860c492808ec;hb=baa8acf3af23bc5d9373144bef8147744b5ae01f;hp=f46c323143deba46ca438468f056d2656d675acc;hpb=5defa7746a21c5afdce5ac0f6a4c34795a61a272;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-ust-dynamic-type.c b/src/lib/lttng-ust/lttng-ust-dynamic-type.c
index f46c3231..4147e3a7 100644
--- a/src/lib/lttng-ust/lttng-ust-dynamic-type.c
+++ b/src/lib/lttng-ust/lttng-ust-dynamic-type.c
@@ -69,49 +69,49 @@ const struct lttng_ust_event_field *dt_var_fields[_NR_LTTNG_UST_DYNAMIC_TYPES] =
 	[LTTNG_UST_DYNAMIC_TYPE_S8] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int8",
-		.type = lttng_ust_type_integer_define(int8_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(int8_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_S16] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int16",
-		.type = lttng_ust_type_integer_define(int16_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(int16_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_S32] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int32",
-		.type = lttng_ust_type_integer_define(int32_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(int32_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_S64] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int64",
-		.type = lttng_ust_type_integer_define(int64_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(int64_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_U8] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint8",
-		.type = lttng_ust_type_integer_define(uint8_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(uint8_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_U16] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint16",
-		.type = lttng_ust_type_integer_define(uint16_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(uint16_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_U32] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint32",
-		.type = lttng_ust_type_integer_define(uint32_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(uint32_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_U64] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
 		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint64",
-		.type = lttng_ust_type_integer_define(uint64_t, BYTE_ORDER, 10),
+		.type = lttng_ust_type_integer_define(uint64_t, LTTNG_UST_BYTE_ORDER, 10),
 		.nowrite = 0,
 	}),
 	[LTTNG_UST_DYNAMIC_TYPE_FLOAT] = LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {
@@ -149,7 +149,7 @@ static const struct lttng_ust_event_field dt_enum_field = {
 		},
 		.struct_size = sizeof(struct lttng_ust_type_enum),
 		.desc = &dt_enum_desc,
-		.container_type = lttng_ust_type_integer_define(char, BYTE_ORDER, 10),
+		.container_type = lttng_ust_type_integer_define(char, LTTNG_UST_BYTE_ORDER, 10),
 	}),
 	.nowrite = 0,
 };
@@ -161,7 +161,7 @@ const struct lttng_ust_event_field *lttng_ust_dynamic_type_field(int64_t value)
 	return dt_var_fields[value];
 }
 
-int lttng_ust_dynamic_type_choices(size_t *nr_choices, const struct lttng_ust_event_field ***choices)
+int lttng_ust_dynamic_type_choices(size_t *nr_choices, const struct lttng_ust_event_field * const **choices)
 {
 	*nr_choices = _NR_LTTNG_UST_DYNAMIC_TYPES;
 	*choices = dt_var_fields;