aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-12-31 17:33:22 +0000
committerUlrich Drepper <drepper@redhat.com>2001-12-31 17:33:22 +0000
commitf8580b753aceb4e6fe2e32bebd33320abe717d33 (patch)
tree33320849ce042856f7fd7fe75cc4d1a36693b7af
parentc7e23b4b05fc77f7a2be0e12780cf87c1e95ec82 (diff)
downloadglibc-f8580b753aceb4e6fe2e32bebd33320abe717d33.tar
glibc-f8580b753aceb4e6fe2e32bebd33320abe717d33.tar.gz
glibc-f8580b753aceb4e6fe2e32bebd33320abe717d33.tar.bz2
glibc-f8580b753aceb4e6fe2e32bebd33320abe717d33.zip
Include sys/param.h. (RESOLVE_CONFLICT_FIND_MAP): Cast r_offset to ElfW(Addr).
-rw-r--r--elf/dl-conflict.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c
index f4c20eaad0..0f863ac893 100644
--- a/elf/dl-conflict.c
+++ b/elf/dl-conflict.c
@@ -24,6 +24,7 @@
#include <unistd.h>
#include <ldsodefs.h>
#include <sys/mman.h>
+#include <sys/param.h>
#include <sys/types.h>
#include "dynamic-link.h"
@@ -47,8 +48,10 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
#define RESOLVE_CONFLICT_FIND_MAP(map, r_offset) \
do \
{ \
- while (resolve_conflict_map->l_map_end < (r_offset) \
- || resolve_conflict_map->l_map_start > (r_offset)) \
+ while ((resolve_conflict_map->l_map_end \
+ < (ElfW(Addr))(r_offset)) \
+ || (resolve_conflict_map->l_map_start \
+ > (ElfW(Addr))(r_offset))) \
resolve_conflict_map \
= resolve_conflict_map->l_next; \
(map) = resolve_conflict_map; \