qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include sys/param.h. (RESOLVE_CONFLICT_FIND_MAP): Cast r_offset to ElfW(Addr).

This commit is contained in:
Ulrich Drepper 2001-12-31 17:33:22 +00:00
parent c7e23b4b05
commit f8580b753a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elf/dl-conflict.c
View File

@ -24,6 +24,7 @@
#include <unistd.h> #include <unistd.h>
#include <ldsodefs.h> #include <ldsodefs.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
#include "dynamic-link.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) \ #define RESOLVE_CONFLICT_FIND_MAP(map, r_offset) \
do \ do \
{ \ { \
while (resolve_conflict_map->l_map_end < (r_offset) \ while ((resolve_conflict_map->l_map_end \
|| resolve_conflict_map->l_map_start > (r_offset)) \ < (ElfW(Addr))(r_offset)) \
|| (resolve_conflict_map->l_map_start \
> (ElfW(Addr))(r_offset))) \
resolve_conflict_map \ resolve_conflict_map \
= resolve_conflict_map->l_next; \ = resolve_conflict_map->l_next; \
(map) = resolve_conflict_map; \ (map) = resolve_conflict_map; \