X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-dl%2Flttng-ust-dl.c;h=b2e43b9613847318839bfb3e0eb82abfcccb871a;hb=298f86d9b065ea6068b1a6e677f3006b8a2521c6;hp=5509597e0b293a46bbb7623d7b61235d09d74ee7;hpb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;p=lttng-ust.git

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index 5509597e..b2e43b96 100644
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -1,21 +1,9 @@
 /*
- * Copyright (C) 2013  Paul Woegerer <paul.woegerer@mentor.com>
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
- * Copyright (C) 2016  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2013 Paul Woegerer <paul.woegerer@mentor.com>
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
 #define _LGPL_SOURCE
@@ -25,10 +13,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lttng/ust-dlfcn.h>
+#include <ust-dlfcn.h>
 #include <lttng/ust-elf.h>
 #include <lttng/ust-events.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "usterr-signal-safe.h"
 
 /* Include link.h last else it conflicts with ust-dlfcn. */
@@ -44,6 +32,12 @@ static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
 #endif
 static int (*__lttng_ust_plibc_dlclose)(void *handle);
 
+static __attribute__((constructor))
+void _lttng_ust_dl_init(void)
+{
+	ust_err_init();
+}
+
 static
 void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
 {