X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=5800d9d612bae2a60040050a5ee9cab2c377f845;hb=5f796aec4e514c556b20454a58c6ca9b4f3128a9;hp=fcf2cb1411636e46b76d0c10f54c2086a43d6c52;hpb=ddabe860f4cf41a4206a8157d83e6b9354f85cb5;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index fcf2cb14..5800d9d6 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -29,6 +29,7 @@
 #include <urcu/compiler.h>
 #include <lttng/urcu/urcu-ust.h>
 
+#include <lttng/ust-utils.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust.h>
@@ -53,7 +54,7 @@
 #include "ust-compat.h"
 
 /* Concatenate lttng ust shared library name with its major version number. */
-#define LTTNG_UST_LIB_SO_NAME "liblttng-ust.so." __ust_stringify(CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR)
+#define LTTNG_UST_LIB_SO_NAME "liblttng-ust.so." lttng_ust_stringify(CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR)
 
 /*
  * Has lttng ust comm constructor been called ?
@@ -768,7 +769,7 @@ int handle_bytecode_recv(struct sock_info *sock_info,
 		int sock, struct ustcomm_ust_msg *lum)
 {
 	struct lttng_ust_bytecode_node *bytecode = NULL;
-	enum lttng_ust_bytecode_node_type type;
+	enum lttng_ust_bytecode_type type;
 	const struct lttng_ust_abi_objd_ops *ops;
 	uint32_t data_size, data_size_max, reloc_offset;
 	uint64_t seqnum;
@@ -777,14 +778,14 @@ int handle_bytecode_recv(struct sock_info *sock_info,
 
 	switch (lum->cmd) {
 	case LTTNG_UST_ABI_FILTER:
-		type = LTTNG_UST_BYTECODE_NODE_TYPE_FILTER;
+		type = LTTNG_UST_BYTECODE_TYPE_FILTER;
 		data_size = lum->u.filter.data_size;
 		data_size_max = LTTNG_UST_ABI_FILTER_BYTECODE_MAX_LEN;
 		reloc_offset = lum->u.filter.reloc_offset;
 		seqnum = lum->u.filter.seqnum;
 		break;
 	case LTTNG_UST_ABI_CAPTURE:
-		type = LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE;
+		type = LTTNG_UST_BYTECODE_TYPE_CAPTURE;
 		data_size = lum->u.capture.data_size;
 		data_size_max = LTTNG_UST_ABI_CAPTURE_BYTECODE_MAX_LEN;
 		reloc_offset = lum->u.capture.reloc_offset;
@@ -2444,7 +2445,7 @@ void ust_after_fork_child(sigset_t *restore_sigset)
 		return;
 	lttng_context_vpid_reset();
 	lttng_context_vtid_reset();
-	lttng_context_procname_reset();
+	lttng_ust_context_procname_reset();
 	ust_context_ns_reset();
 	ust_context_vuids_reset();
 	ust_context_vgids_reset();