Module Name: src
Committed By: christos
Date: Sun Apr 10 23:37:10 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: merge.c
Log Message:
Apply revision 274569 from FreeBSD:
Only compare visitation counters if they've both been set for the current
type graph walk.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.6 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.7
--- src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.6 Fri Mar 18 13:07:23 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c Sun Apr 10 19:37:10 2016
@@ -361,7 +361,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp,
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);
