X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-dynamic-type.c;h=2b3ebd6551a99f7512bde77abf21eb5de87bd2b6;hb=810185f3a90e717e2a482b4555f90f4d4f6d7bbf;hp=06333906324040e30e18946106166097cf6abd71;hpb=3d33ca1d93088e049c36fc0f417d130bc66b2231;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 06333906..2b3ebd65 100644
--- a/src/lib/lttng-ust/lttng-ust-dynamic-type.c
+++ b/src/lib/lttng-ust/lttng-ust-dynamic-type.c
@@ -15,7 +15,7 @@
 #include "common/macros.h"
 #include "common/dynamic-type.h"
 
-#define ctf_enum_value(_string, _value)					\
+#define lttng_ust_field_enum_value(_string, _value)					\
 	LTTNG_UST_COMPOUND_LITERAL(struct lttng_ust_enum_entry, {		\
 		.struct_size = sizeof(struct lttng_ust_enum_entry),		\
 		.start = {						\
@@ -32,18 +32,18 @@
 	}),
 
 static const struct lttng_ust_enum_entry *dt_enum[_NR_LTTNG_UST_DYNAMIC_TYPES] = {
-	[LTTNG_UST_DYNAMIC_TYPE_NONE] = ctf_enum_value("_none", 0)
-	[LTTNG_UST_DYNAMIC_TYPE_S8] = ctf_enum_value("_int8", 1)
-	[LTTNG_UST_DYNAMIC_TYPE_S16] = ctf_enum_value("_int16", 2)
-	[LTTNG_UST_DYNAMIC_TYPE_S32] = ctf_enum_value("_int32", 3)
-	[LTTNG_UST_DYNAMIC_TYPE_S64] = ctf_enum_value("_int64", 4)
-	[LTTNG_UST_DYNAMIC_TYPE_U8] = ctf_enum_value("_uint8", 5)
-	[LTTNG_UST_DYNAMIC_TYPE_U16] = ctf_enum_value("_uint16", 6)
-	[LTTNG_UST_DYNAMIC_TYPE_U32] = ctf_enum_value("_uint32", 7)
-	[LTTNG_UST_DYNAMIC_TYPE_U64] = ctf_enum_value("_uint64", 8)
-	[LTTNG_UST_DYNAMIC_TYPE_FLOAT] = ctf_enum_value("_float", 9)
-	[LTTNG_UST_DYNAMIC_TYPE_DOUBLE] = ctf_enum_value("_double", 10)
-	[LTTNG_UST_DYNAMIC_TYPE_STRING] = ctf_enum_value("_string", 11)
+	[LTTNG_UST_DYNAMIC_TYPE_NONE] = lttng_ust_field_enum_value("_none", 0)
+	[LTTNG_UST_DYNAMIC_TYPE_S8] = lttng_ust_field_enum_value("_int8", 1)
+	[LTTNG_UST_DYNAMIC_TYPE_S16] = lttng_ust_field_enum_value("_int16", 2)
+	[LTTNG_UST_DYNAMIC_TYPE_S32] = lttng_ust_field_enum_value("_int32", 3)
+	[LTTNG_UST_DYNAMIC_TYPE_S64] = lttng_ust_field_enum_value("_int64", 4)
+	[LTTNG_UST_DYNAMIC_TYPE_U8] = lttng_ust_field_enum_value("_uint8", 5)
+	[LTTNG_UST_DYNAMIC_TYPE_U16] = lttng_ust_field_enum_value("_uint16", 6)
+	[LTTNG_UST_DYNAMIC_TYPE_U32] = lttng_ust_field_enum_value("_uint32", 7)
+	[LTTNG_UST_DYNAMIC_TYPE_U64] = lttng_ust_field_enum_value("_uint64", 8)
+	[LTTNG_UST_DYNAMIC_TYPE_FLOAT] = lttng_ust_field_enum_value("_float", 9)
+	[LTTNG_UST_DYNAMIC_TYPE_DOUBLE] = lttng_ust_field_enum_value("_double", 10)
+	[LTTNG_UST_DYNAMIC_TYPE_STRING] = lttng_ust_field_enum_value("_string", 11)
 };
 
 static struct lttng_ust_enum_desc dt_enum_desc = {
@@ -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,
 };