X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=a269104965e9c8348af7bb4a89c3f65ec6d634a9;hb=c73b6bcde2c1136b9cf18e859746bb2f3201cd7a;hp=891eb16eef2ec71eb81cbf7d0c108a8d04d0f0be;hpb=864a1eda22ed99266509ac76451c6f27f91aa17e;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 891eb16e..a2691049 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -29,7 +29,6 @@
 #include <urcu/compiler.h>
 #include <lttng/urcu/urcu-ust.h>
 
-#include <lttng/align.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust.h>
@@ -50,6 +49,7 @@
 #include "getenv.h"
 #include "ust-events-internal.h"
 #include "context-internal.h"
+#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)
@@ -1718,7 +1718,7 @@ void wait_for_sessiond(struct sock_info *sock_info)
 "Please upgrade your kernel "
 "(fix is commit 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae in Linux kernel "
 "mainline). LTTng-UST will use polling mode fallback.");
-			if (ust_debug())
+			if (ust_err_debug_enabled())
 				PERROR("futex");
 			goto end_wait;
 		}
@@ -2107,8 +2107,8 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	 * sessiond (otherwise leading to errors when trying to create
 	 * sessiond before the init functions are completed).
 	 */
-	init_usterr();
-	lttng_ust_getenv_init();	/* Needs init_usterr() to be completed. */
+	ust_err_init();
+	lttng_ust_getenv_init();	/* Needs ust_err_init() to be completed. */
 	init_tracepoint();
 	lttng_ust_init_fd_tracker();
 	lttng_ust_clock_init();