X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Ftracepoint.c;h=8d89d144f773a9597b45709e010f0bc655713ab8;hb=9c4fe08d87975f3f79227b1b5e7629d52a16b4fc;hp=e5a970adc19207f1a81ea92c2d8d52fe5c56a2e4;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/tracepoint.c b/src/lib/lttng-ust/tracepoint.c
index e5a970ad..8d89d144 100644
--- a/src/lib/lttng-ust/tracepoint.c
+++ b/src/lib/lttng-ust/tracepoint.c
@@ -28,8 +28,8 @@
 
 #include "tracepoint-internal.h"
 #include "lttng-tracer-core.h"
-#include "jhash.h"
-#include "error.h"
+#include "common/jhash.h"
+#include "common/err-ptr.h"
 
 /* Test compiler support for weak symbols with hidden visibility. */
 int __tracepoint_test_symbol1 __attribute__((weak, visibility("hidden")));
@@ -894,7 +894,7 @@ lib_added:
 
 	DBG("just registered a tracepoints section from %p and having %d tracepoints",
 		tracepoints_start, tracepoints_count);
-	if (ust_err_debug_enabled()) {
+	if (lttng_ust_logging_debug_enabled()) {
 		int i;
 
 		for (i = 0; i < tracepoints_count; i++) {
@@ -958,7 +958,7 @@ void lttng_ust_tp_init(void)
 {
 	if (uatomic_xchg(&initialized, 1) == 1)
 		return;
-	ust_err_init();
+	lttng_ust_logging_init();
 	check_weak_hidden();
 }