Fix: event-notifier: not propagating error counter indexes

[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 b0737b65f9f4222d6beef931b7ce3a07eef0ea1c..5509597e0b293a46bbb7623d7b61235d09d74ee7 100644 (file)
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -38,8 +38,10 @@
 #include "ust_dl.h"
 
 static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
+#ifdef HAVE_DLMOPEN
 static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
                int flags);
+#endif
 static int (*__lttng_ust_plibc_dlclose)(void *handle);
 
 static
@@ -55,6 +57,7 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
        return __lttng_ust_plibc_dlopen(filename, flags);
 }
 
+#ifdef HAVE_DLMOPEN
 static
 void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
                int flags)
@@ -68,6 +71,7 @@ void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
        }
        return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
 }
+#endif
 
 static
 int _lttng_ust_dl_libc_dlclose(void *handle)
@@ -103,7 +107,7 @@ void lttng_ust_dl_dlopen(void *so_base, const char *so_name,
 
        elf = lttng_ust_elf_create(resolved_path);
        if (!elf) {
-               ERR("could not acces file %s", resolved_path);
+               ERR("could not access file %s", resolved_path);
                return;
        }
 
@@ -143,6 +147,7 @@ end:
        return;
 }
 
+#ifdef HAVE_DLMOPEN
 static
 void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
                int flags, void *ip)
@@ -164,7 +169,7 @@ void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
 
        elf = lttng_ust_elf_create(resolved_path);
        if (!elf) {
-               ERR("could not acces file %s", resolved_path);
+               ERR("could not access file %s", resolved_path);
                return;
        }
 
@@ -203,6 +208,7 @@ end:
        lttng_ust_elf_destroy(elf);
        return;
 }
+#endif
 
 void *dlopen(const char *filename, int flags)
 {
@@ -223,6 +229,7 @@ void *dlopen(const char *filename, int flags)
        return handle;
 }
 
+#ifdef HAVE_DLMOPEN
 void *dlmopen(Lmid_t nsid, const char *filename, int flags)
 {
        void *handle;
@@ -243,6 +250,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
        return handle;
 
 }
+#endif
 
 int dlclose(void *handle)
 {