#include <unistd.h>
#include <ust-dlfcn.h>
-#include <lttng/ust-elf.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>
#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)
{