[src/trunk]: src/external/cddl/osnet/dist/tools/ctf/cvt Apply revision 274569...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a068e39919fb
branches:  trunk
changeset: 814811:a068e39919fb
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 10 23:37:10 2016 +0000

description:
Apply revision 274569 from FreeBSD:
Only compare visitation counters if they've both been set for the current
type graph walk.

diffstat:

 external/cddl/osnet/dist/tools/ctf/cvt/merge.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r b88ea4a47caa -r a068e39919fb external/cddl/osnet/dist/tools/ctf/cvt/merge.c
--- a/external/cddl/osnet/dist/tools/ctf/cvt/merge.c    Sun Apr 10 21:45:33 2016 +0000
+++ b/external/cddl/osnet/dist/tools/ctf/cvt/merge.c    Sun Apr 10 23:37:10 2016 +0000
@@ -361,7 +361,7 @@
        int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *);
        int mapping;
 
-       if (ctdp->t_emark > ed->ed_clear_mark ||
+       if (ctdp->t_emark > ed->ed_clear_mark &&
            mtdp->t_emark > ed->ed_clear_mark)
                return (ctdp->t_emark == mtdp->t_emark);