X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust-comm.h;h=ae53f158e83dc338ae09e43047ef8adda154a1fc;hb=fca361e81cbb39f076182e9d2c6dd2c4c8c25b5d;hp=133426e5e5f5e9e4a75e2b895cce4800013dad31;hpb=7f2348b85735a6284d2ada79d9c7cd2e96f45bbf;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 133426e5..ae53f158 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -31,6 +31,7 @@
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
 #include <lttng/ust-compiler.h>
+#include <config.h>
 
 /*
  * Default timeout the application waits for the sessiond to send its
@@ -40,7 +41,7 @@
  */
 #define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS	3000
 
-#define LTTNG_DEFAULT_RUNDIR				"/var/run/lttng"
+#define LTTNG_DEFAULT_RUNDIR				LTTNG_SYSTEM_RUNDIR
 #define LTTNG_DEFAULT_HOME_RUNDIR			".lttng"
 
 /* Queue size of listen(2) */
@@ -48,6 +49,7 @@
 #define LTTNG_UST_COMM_REG_MSG_PADDING			64
 
 struct lttng_event_field;
+struct lttng_ctx_field;
 
 struct ustctl_reg_msg {
 	uint32_t magic;
@@ -226,7 +228,7 @@ int ustcomm_register_channel(int sock,
 	int session_objd,		/* session descriptor */
 	int channel_objd,		/* channel descriptor */
 	size_t nr_ctx_fields,
-	const struct lttng_event_field *ctx_fields,
+	const struct lttng_ctx_field *ctx_fields,
 	uint32_t *chan_id,		/* channel id (output) */
 	int *header_type); 		/* header type (output) */