X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-elf.c;h=663699b7ce91a5d9febf0d9903b64d042a580782;hb=093c3f9bbdda113147ab03be62aaa37bd1c786b4;hp=c9d2b6b3c406dcb33a8a39dfaab51af7dbe39917;hpb=e1f0c5692aa0f75c547e28efd734cc911503c4f3;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index c9d2b6b3..663699b7 100644
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <helper.h>
 #include <string.h>
 #include <lttng/align.h>
@@ -25,6 +26,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdbool.h>
 #include "lttng-tracer-core.h"
 
 #define BUF_LEN	4096
@@ -376,9 +378,9 @@ int lttng_ust_elf_get_memsz(struct lttng_ust_elf *elf, uint64_t *memsz)
 			goto next_loop;
 		}
 
-		low_addr = phdr->p_vaddr < low_addr ? phdr->p_vaddr : low_addr;
-		high_addr = phdr->p_vaddr + phdr->p_memsz > high_addr ?
-				phdr->p_vaddr + phdr->p_memsz : high_addr;
+		low_addr = min_t(uint64_t, low_addr, phdr->p_vaddr);
+		high_addr = max_t(uint64_t, high_addr,
+				phdr->p_vaddr + phdr->p_memsz);
 	next_loop:
 		free(phdr);
 	}