X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-sessiond.h;h=92f051c16ef744ce8eb42ecb31152e61f474f66f;hp=1dc6fade8fac43a54d2a4c17687f8d6e0047bc54;hb=74e89a8c6a6824c4ca8179a3ae7b9cc4c99bddc5;hpb=3c6673a8358871588c2bd41412e51e79957c7032

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 1dc6fade8..92f051c16 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -25,7 +25,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/compat/poll.h>
 #include <common/compat/socket.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 
 #include "session.h"
 #include "ust-app.h"
@@ -75,7 +75,6 @@ extern const char default_home_dir[],
 	default_global_apps_pipe[];
 
 /* Set in main.c at boot time of the daemon */
-extern int kernel_tracer_fd;
 extern struct lttng_kernel_tracer_version kernel_tracer_version;
 extern struct lttng_kernel_tracer_abi_version kernel_tracer_abi_version;
 
@@ -164,7 +163,7 @@ extern struct consumer_data kconsumer_data;
 
 int sessiond_init_thread_quit_pipe(void);
 int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
-int sessiond_wait_for_quit_pipe(unsigned int timeout_us);
+int sessiond_wait_for_quit_pipe(int timeout_ms);
 int sessiond_notify_quit_pipe(void);
 void sessiond_close_quit_pipe(void);