X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-dl%2Fustdl.c;h=b6abca7b6e13c7562bbb4d1b8fccbcaea64bdf2b;hb=bf76f1eab36703b89fb512738a7b1662f4dd3694;hp=dbde8b7fedd9976d7f4f28619c58d0c16afe3e3c;hpb=13436238c6418c33e4eb3c3ab8e2a466f1597fd2;p=lttng-ust.git

diff --git a/liblttng-ust-dl/ustdl.c b/liblttng-ust-dl/ustdl.c
index dbde8b7f..b6abca7b 100644
--- a/liblttng-ust-dl/ustdl.c
+++ b/liblttng-ust-dl/ustdl.c
@@ -16,9 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #define _GNU_SOURCE
+#include <lttng/ust-dlfcn.h>
 #include <inttypes.h>
-#include <dlfcn.h>
 #include <link.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -89,7 +90,7 @@ void lttng_ust_baddr_push(void *so_base, const char *so_name)
 void *dlopen(const char *filename, int flag)
 {
 	void *handle = _lttng_ust_dl_libc_dlopen(filename, flag);
-	if (handle) {
+	if (__tracepoint_ptrs_registered && handle) {
 		struct link_map *p = NULL;
 		if (dlinfo(handle, RTLD_DI_LINKMAP, &p) != -1 && p != NULL
 				&& p->l_addr != 0)
@@ -100,7 +101,7 @@ void *dlopen(const char *filename, int flag)
 
 int dlclose(void *handle)
 {
-	if (handle) {
+	if (__tracepoint_ptrs_registered && handle) {
 		struct link_map *p = NULL;
 		if (dlinfo(handle, RTLD_DI_LINKMAP, &p) != -1 && p != NULL
 				&& p->l_addr != 0)