diff options
| -rw-r--r-- | libctf/ChangeLog | 5 | ||||
| -rw-r--r-- | libctf/ctf-link.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libctf/ChangeLog b/libctf/ChangeLog index ba6664f..d664998 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,5 +1,10 @@ 2020-07-22 Nick Alcock <nick.alcock@oracle.com> + * ctf-link.c (ctf_link_one_variable): Check the dst_type for + conflicts, not the source type. + +2020-07-22 Nick Alcock <nick.alcock@oracle.com> + * ctf-impl.h (ctf_file_t): Improve comments. <ctf_link_cu_mapping>: Split into... <ctf_link_in_cu_mapping>: ... this... diff --git a/libctf/ctf-link.c b/libctf/ctf-link.c index 3c96604..7b0ac38 100644 --- a/libctf/ctf-link.c +++ b/libctf/ctf-link.c @@ -584,7 +584,7 @@ ctf_link_one_variable (const char *name, ctf_id_t type, void *arg_) } /* Already present? Nothing to do. */ - if (dvd && dvd->dvd_type == type) + if (dvd && dvd->dvd_type == dst_type) return 0; } } |