From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 31 Dec 2001 17:33:22 +0000 (+0000)
Subject: Include sys/param.h. (RESOLVE_CONFLICT_FIND_MAP): Cast r_offset to ElfW(Addr).
X-Git-Tag: cvs/glibc-2-3~1255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8580b753aceb4e6fe2e32bebd33320abe717d33;p=thirdparty%2Fglibc.git

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

diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c
index f4c20eaad07..0f863ac893d 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;				\