X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=59446c4b783c77715e8048f85546a8846f03874e;hb=f0fde1c3984721c0660c7d5a1377db74b6c03a70;hp=18706fa898139e3161a0620196d1f60f0c0e16aa;hpb=1a37a8730e943967540944344da2f8bd1702d78e;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 18706fa8..59446c4b 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -21,10 +21,6 @@
 #include <urcu/ref.h>
 #include <pthread.h>
 
-#ifndef LTTNG_PACKED
-#error "LTTNG_PACKED should be defined"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -146,7 +142,7 @@ struct lttng_ust_type_float {
  * Only float and double are supported. long double is not supported at
  * the moment.
  */
-#define _float_mant_dig(_type)						\
+#define lttng_ust_float_mant_dig(_type)					\
 	(sizeof(_type) == sizeof(float) ? FLT_MANT_DIG			\
 		: (sizeof(_type) == sizeof(double) ? DBL_MANT_DIG	\
 		: 0))
@@ -158,8 +154,8 @@ struct lttng_ust_type_float {
 		},							\
 		.struct_size = sizeof(struct lttng_ust_type_float),	\
 		.exp_dig = sizeof(_type) * CHAR_BIT			\
-			- _float_mant_dig(_type),			\
-		.mant_dig = _float_mant_dig(_type),			\
+			- lttng_ust_float_mant_dig(_type),		\
+		.mant_dig = lttng_ust_float_mant_dig(_type),		\
 		.alignment = lttng_alignof(_type) * CHAR_BIT,		\
 		.reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,	\
 	}))
@@ -303,9 +299,9 @@ struct lttng_ust_probe_desc {
 /*
  * Bytecode interpreter return value masks.
  */
-enum lttng_bytecode_interpreter_ret {
-	LTTNG_INTERPRETER_DISCARD = 0,
-	LTTNG_INTERPRETER_RECORD_FLAG = (1ULL << 0),
+enum lttng_ust_bytecode_interpreter_ret {
+	LTTNG_UST_BYTECODE_INTERPRETER_DISCARD = 0,
+	LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG = (1ULL << 0),
 	/* Other bits are kept for future use. */
 };