Fix: pass private data to context callbacks

[lttng-ust.git] / liblttng-ust-dl / lttng-ust-dl.c

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index 004a7ae266596fb939427bb79d9e2f16a6c6c21a..1394ce1963fce5e31ec53dc41e1b39ebf21237c3 100644 (file)
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -13,12 +13,14 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lttng/ust-dlfcn.h>
-#include <lttng/ust-elf.h>
+#include <ust-dlfcn.h>
+#include <ust-elf.h>
 #include <lttng/ust-events.h>
-#include <helper.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)
 {