summaryrefslogtreecommitdiff
path: root/contrib/cvs/diff/diff3.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-12-11 14:58:02 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-12-11 14:58:02 +0000
commit5e84812fa385eebe9addbe9ccc22e3608bf32ca0 (patch)
tree9c38b8fbc6baeac655ca48690d61cb966b85e664 /contrib/cvs/diff/diff3.c
parent5f02be00bca1a5821383c9593ffbd4155c6ef27e (diff)
Notes
Diffstat (limited to 'contrib/cvs/diff/diff3.c')
-rw-r--r--contrib/cvs/diff/diff3.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c
index e3be1503e86f..c2997e92cb5f 100644
--- a/contrib/cvs/diff/diff3.c
+++ b/contrib/cvs/diff/diff3.c
@@ -12,6 +12,9 @@
GNU General Public License for more details.
*/
+/*
+ * $FreeBSD$
+ */
/* Written by Randy Smith */
/* Librarification by Tim Pierce */
@@ -1274,7 +1277,7 @@ read_diff (filea, fileb, output_placement)
*ap++ = fileb;
*ap = 0;
- diffout = tmpnam(NULL);
+ diffout = (char *)cvs_temp_name();
outfile_hold = outfile;
callbacks_hold = callbacks;