aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-conflict.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-12 19:17:09 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-12 19:17:09 +0000
commit712ac5b11c3f250c4354d92ee5a902c67b6d2045 (patch)
tree71b172e0aae47370093cd99a523502b3e3173ec6 /elf/dl-conflict.c
parente12ddba5c42d223fd6e35e4ad1d89041c6cd67dd (diff)
downloadglibc-712ac5b11c3f250c4354d92ee5a902c67b6d2045.tar
glibc-712ac5b11c3f250c4354d92ee5a902c67b6d2045.tar.gz
glibc-712ac5b11c3f250c4354d92ee5a902c67b6d2045.tar.bz2
glibc-712ac5b11c3f250c4354d92ee5a902c67b6d2045.zip
(RESOLVE_MAP): Return NULL not 0.
Diffstat (limited to 'elf/dl-conflict.c')
-rw-r--r--elf/dl-conflict.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c
index 3e88e54021..bf48acd8a4 100644
--- a/elf/dl-conflict.c
+++ b/elf/dl-conflict.c
@@ -42,7 +42,7 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
data. */
/* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code. */
-#define RESOLVE_MAP(ref, version, flags) (*ref = NULL, 0)
+#define RESOLVE_MAP(ref, version, flags) (*ref = NULL, NULL)
#define RESOLVE(ref, version, flags) (*ref = NULL, 0)
#define RESOLVE_CONFLICT_FIND_MAP(map, r_offset) \
do { \