X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Flttng-ust-comm.c;h=1246c654c34f5d83f65dc2425a9f0a4728179292;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=a38c5733075b24feab74880cd00697318ab8611e;hpb=003fedf4968e55d8f7711faf784a37d2804c3a21;p=lttng-ust.git

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index a38c5733..1246c654 100644
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -38,13 +38,13 @@
 #include <urcu/uatomic.h>
 #include <urcu/futex.h>
 
-#include <lttng-ust-comm.h>
-#include <ust/lttng-events.h>
-#include <ust/usterr-signal-safe.h>
-#include <ust/lttng-ust-abi.h>
-#include <ust/tracepoint.h>
-#include <ust/tracepoint-internal.h>
-#include <ust/ust.h>
+#include <lttng/ust-comm.h>
+#include <lttng/ust-events.h>
+#include <lttng/usterr-signal-safe.h>
+#include <lttng/ust-abi.h>
+#include <lttng/tracepoint.h>
+#include <lttng/tracepoint-internal.h>
+#include <lttng/ust.h>
 #include "ltt-tracer-core.h"
 
 /*
@@ -234,7 +234,7 @@ int handle_message(struct sock_info *sock_info,
 		int sock, struct ustcomm_ust_msg *lum)
 {
 	int ret = 0;
-	const struct objd_ops *ops;
+	const struct lttng_ust_objd_ops *ops;
 	struct ustcomm_ust_reply lur;
 	int shm_fd, wait_fd;
 
@@ -264,7 +264,7 @@ int handle_message(struct sock_info *sock_info,
 		if (lum->handle == LTTNG_UST_ROOT_HANDLE)
 			ret = -EPERM;
 		else
-			ret = objd_unref(lum->handle);
+			ret = lttng_ust_objd_unref(lum->handle);
 		break;
 	default:
 		if (ops->cmd)
@@ -349,7 +349,7 @@ void cleanup_sock_info(struct sock_info *sock_info)
 		sock_info->socket = -1;
 	}
 	if (sock_info->root_handle != -1) {
-		ret = objd_unref(sock_info->root_handle);
+		ret = lttng_ust_objd_unref(sock_info->root_handle);
 		if (ret) {
 			ERR("Error unref root handle");
 		}