Cleanup: apply `include-what-you-use` guideline for `uint*_t`

[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..e38eaf1e7d8f5cda4011d887940519111f61163f 100644 (file)
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -22,6 +22,7 @@
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -38,8 +39,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 +58,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 +72,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 +108,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 +148,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 +170,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 +209,7 @@ end:
        lttng_ust_elf_destroy(elf);
        return;
 }
+#endif
 
 void *dlopen(const char *filename, int flags)
 {
@@ -223,6 +230,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 +251,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
        return handle;
 
 }
+#endif
 
 int dlclose(void *handle)
 {