X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-dl%2Flttng-ust-dl.c;h=1394ce1963fce5e31ec53dc41e1b39ebf21237c3;hb=c53279a3e7796da67c5ad8d5e5657bf03def2dcb;hp=6b7362aca2b74402c2baf3bab4071b2ed677ad5e;hpb=864a1eda22ed99266509ac76451c6f27f91aa17e;p=lttng-ust.git

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index 6b7362ac..1394ce19 100644
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -14,11 +14,13 @@
 #include <unistd.h>
 
 #include <ust-dlfcn.h>
-#include <lttng/ust-elf.h>
+#include <ust-elf.h>
 #include <lttng/ust-events.h>
 #include <ust-helper.h>
 #include "usterr-signal-safe.h"
 
+#include "../liblttng-ust/ust-events-internal.h"
+
 /* Include link.h last else it conflicts with ust-dlfcn. */
 #include <link.h>
 
@@ -32,6 +34,15 @@ static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
 #endif
 static int (*__lttng_ust_plibc_dlclose)(void *handle);
 
+static
+void _lttng_ust_dl_init(void)
+	__attribute__((constructor));
+static
+void _lttng_ust_dl_init(void)
+{
+	ust_err_init();
+}
+
 static
 void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
 {