Module Name: src
Committed By: uwe
Date: Sat May 4 18:22:59 UTC 2024
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctfmerge.c
Log Message:
ctfmerge: obey CTFMERGE_TERMINATE_NO_UNLINK as a tool too
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.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/ctfmerge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.19 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.20
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.19 Fri May 3 15:50:42 2024
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Sat May 4 18:22:59 2024
@@ -682,7 +682,7 @@ terminate_cleanup(void)
if (outfile == NULL)
return;
-#if !defined (__FreeBSD__) && !defined(__NetBSD__)
+#if !defined (__FreeBSD__) && !(defined(__NetBSD__) || HAVE_NBTOOL_CONFIG_H)
if (dounlink) {
fprintf(stderr, "Removing %s\n", outfile);
unlink(outfile);
