projects
/
external
/
glibc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e12ddba
)
(RESOLVE_MAP): Return NULL not 0.
author
Ulrich Drepper
<drepper@redhat.com>
Tue, 12 Feb 2002 19:17:09 +0000
(19:17 +0000)
committer
Ulrich Drepper
<drepper@redhat.com>
Tue, 12 Feb 2002 19:17:09 +0000
(19:17 +0000)
elf/dl-conflict.c
patch
|
blob
|
history
diff --git
a/elf/dl-conflict.c
b/elf/dl-conflict.c
index
3e88e54
..
bf48acd
100644
(file)
--- 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 { \