1From 8ebcf5f2dd27dbeb6c81e9c40a5d17916cb243e6 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Mon, 23 Nov 2020 15:26:31 -0800 4Subject: [PATCH] heaptrack_inject: Include dlfcn.h for dlopen/dlclose 5 6Do not use __WORDSIZE which is for libc internal use 7 8Upstream-Status: Pending 9Signed-off-by: Khem Raj <raj.khem@gmail.com> 10--- 11 src/track/heaptrack_inject.cpp | 6 ++++-- 12 1 file changed, 4 insertions(+), 2 deletions(-) 13 14diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp 15index 325d87e..fb1c154 100644 16--- a/src/track/heaptrack_inject.cpp 17+++ b/src/track/heaptrack_inject.cpp 18@@ -28,6 +28,7 @@ 19 #include <link.h> 20 #include <malloc.h> 21 #include <unistd.h> 22+#include <dlfcn.h> 23 24 #include <sys/mman.h> 25 26@@ -39,9 +40,10 @@ 27 * @brief Experimental support for symbol overloading after runtime injection. 28 */ 29 30-#if __WORDSIZE == 64 31+#include <limits.h> 32+#if ULONG_MAX == 0xffffffffffffffff 33 #define ELF_R_SYM(i) ELF64_R_SYM(i) 34-#elif __WORDSIZE == 32 35+#elif ULONG_MAX == 0xffffffff 36 #define ELF_R_SYM(i) ELF32_R_SYM(i) 37 #else 38 #error unsupported word size 39