X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=bc699a0c708942de399b158ad299b7af0cf8f979;hb=e9f549af207b2228357442e1fafa109bd459e6f3;hp=843fe4ed97c2fccf85e195b80578ca873f19cc5d;hpb=9f5ade14faf36df6429d9c6e1d0360854a5669d0;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 843fe4ed..bc699a0c 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -12,11 +12,6 @@
 #include <stdint.h>
 #include <lttng/ust-compiler.h>
 
-#ifndef __ust_stringify
-#define __ust_stringify1(x)	#x
-#define __ust_stringify(x)	__ust_stringify1(x)
-#endif /* __ust_stringify */
-
 #define LTTNG_UST_ABI_SYM_NAME_LEN			256
 #define LTTNG_UST_ABI_PROCNAME_LEN		16
 
@@ -103,8 +98,8 @@ struct lttng_ust_abi_counter_dimension {
 
 #define LTTNG_UST_ABI_COUNTER_CONF_PADDING1 67
 struct lttng_ust_abi_counter_conf {
-	uint32_t arithmetic;	/* enum lttng_ust_counter_arithmetic */
-	uint32_t bitness;	/* enum lttng_ust_counter_bitness */
+	uint32_t arithmetic;	/* enum lttng_ust_abi_counter_arithmetic */
+	uint32_t bitness;	/* enum lttng_ust_abi_counter_bitness */
 	uint32_t number_dimensions;
 	int64_t global_sum_step;
 	struct lttng_ust_abi_counter_dimension dimensions[LTTNG_UST_ABI_COUNTER_DIMENSION_MAX];
@@ -308,14 +303,14 @@ struct lttng_ust_abi_object_data {
 	} u;
 } __attribute__((packed));
 
-enum lttng_ust_calibrate_type {
+enum lttng_ust_abi_calibrate_type {
 	LTTNG_UST_ABI_CALIBRATE_TRACEPOINT,
 };
 
 #define LTTNG_UST_ABI_CALIBRATE_PADDING1	16
 #define LTTNG_UST_ABI_CALIBRATE_PADDING2	(LTTNG_UST_ABI_SYM_NAME_LEN + 32)
 struct lttng_ust_abi_calibrate {
-	enum lttng_ust_calibrate_type type;	/* type (input) */
+	enum lttng_ust_abi_calibrate_type type;		/* type (input) */
 	char padding[LTTNG_UST_ABI_CALIBRATE_PADDING1];
 
 	union {