Compilation fixes

pmachata · Nov 11, 2015 · a601214 · a601214
1 parent dbf7ec8
commit a601214
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dwarf_prototypes.c b/dwarf_prototypes.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <elfutils/libdwfl.h>
 #include <dwarf.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
@@ -27,7 +28,7 @@
 #include "debug.h"
 
 #define complain(die, format, ...)					\
-	debug(DEBUG_FUNCTION, "%s() die '%s' @ 0x%lx: " format,		\
+	debug(DEBUG_FUNCTION, "%s() die '%s' @ 0x%" PRIx64 ": " format, \
 	      __func__, dwarf_diename(die), dwarf_dieoffset(die),	\
 	      ##__VA_ARGS__)
 

diff --git a/proc.c b/proc.c
@@ -944,7 +944,8 @@ proc_add_library(struct process *proc, struct library *lib)
 		dwfl_module =
 			dwfl_report_elf(dwfl, lib->soname,
 					lib->pathname, -1,
-					(GElf_Addr) lib->base,
+					/* XXX double cast */
+					(GElf_Addr) (uintptr_t) lib->base,
 					false);
 		if (dwfl_module == NULL)
 			fprintf(stderr,