X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ust-comm.c;h=17c7350de06a8078c6ddc543e8c1468b44430593;hb=23c8854a5fa1120df5cfdfbf08f00e00976f95fa;hp=d0239cda76f51d25129626f4a0da5659cef564d6;hpb=2fed87aef82aaa8edfb6d8d8ac6bbf5f1e67b955;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index d0239cda..17c7350d 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -42,8 +42,7 @@
 #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 "tracepoint-internal.h"
 #include <lttng/ust.h>
 #include "ltt-tracer-core.h"
 
@@ -301,7 +300,7 @@ end:
 		shm_fd = lum->u.channel.shm_fd;
 		wait_fd = lum->u.channel.wait_fd;
 		break;
-	case LTTNG_UST_VERSION:
+	case LTTNG_UST_TRACER_VERSION:
 		lur.u.version = lum->u.version;
 		break;
 	case LTTNG_UST_TRACEPOINT_LIST_GET:
@@ -904,7 +903,7 @@ static void ust_after_fork_common(sigset_t *restore_sigset)
 	DBG("process %d", getpid());
 	ust_unlock();
 	/* Restore signals */
-	ret = sigprocmask(SIG_SETMASK, &restore_sigset, NULL);
+	ret = sigprocmask(SIG_SETMASK, restore_sigset, NULL);
 	if (ret == -1) {
 		PERROR("sigprocmask");
 	}