X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fevents.h;h=5e456c52a38e3e3b3886fbfb7dff2b19637362b1;hb=92bc1e2318d93c9072ae79d7fd6a7c5953cb739e;hp=9cbc3b999d18a89edb1338608f3d3ded9d4c076d;hpb=12bb2edb6ed3e96d3299a979e49b828f2b17dcb2;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 9cbc3b99..5e456c52 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -46,11 +46,11 @@ enum lttng_kernel_type {
 	NR_LTTNG_KERNEL_TYPES,
 };
 
-enum lttng_string_encodings {
-	lttng_encode_none = 0,
-	lttng_encode_UTF8 = 1,
-	lttng_encode_ASCII = 2,
-	NR_STRING_ENCODINGS,
+enum lttng_kernel_string_encoding {
+	lttng_kernel_string_encoding_none = 0,
+	lttng_kernel_string_encoding_UTF8 = 1,
+	lttng_kernel_string_encoding_ASCII = 2,
+	NR_LTTNG_KERNEL_STRING_ENCODING,
 };
 
 enum channel_type {
@@ -82,7 +82,7 @@ struct lttng_enum_entry {
 		  .signedness = (_signedness) >= 0 ? (_signedness) : lttng_is_signed_type(_type), \
 		  .reverse_byte_order = _byte_order != __BYTE_ORDER, \
 		  .base = _base,				\
-		  .encoding = lttng_encode_##_encoding,		\
+		  .encoding = lttng_kernel_string_encoding_##_encoding,		\
 		},						\
 	}							\
 
@@ -92,7 +92,7 @@ struct lttng_integer_type {
 	unsigned int signedness:1,
 		reverse_byte_order:1;
 	unsigned int base;		/* 2, 8, 10, 16, for pretty print */
-	enum lttng_string_encodings encoding;
+	enum lttng_kernel_string_encoding encoding;
 };
 
 struct lttng_type {
@@ -100,7 +100,7 @@ struct lttng_type {
 	union {
 		struct lttng_integer_type integer;
 		struct {
-			enum lttng_string_encodings encoding;
+			enum lttng_kernel_string_encoding encoding;
 		} string;
 		struct {
 			const struct lttng_enum_desc *desc;	/* Enumeration mapping */