summaryrefslogtreecommitdiff
path: root/usr.bin/diff/diff.h
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-26 04:52:27 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-26 04:52:27 +0000
commitfd7b4abf64f5db6376ebfed2c975bc00d82f4a59 (patch)
tree052ceab190a840edfe5bc53aacdcec2110280d6d /usr.bin/diff/diff.h
parent66b79825bd8d3fc6e7c2c04a33fd1a7beb11a16c (diff)
Fix temp file handling and deal with the case where we might need 2 temp files.
Diffstat (limited to 'usr.bin/diff/diff.h')
-rw-r--r--usr.bin/diff/diff.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index 261a8e475f4..4c33f03dba0 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.h,v 1.8 2003/06/26 00:20:48 tedu Exp $ */
+/* $OpenBSD: diff.h,v 1.9 2003/06/26 04:52:26 millert Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -63,15 +63,15 @@
extern int aflag, bflag, hflag, iflag, lflag, rflag, sflag, tflag, wflag;
extern char *start, *ifdef1, *ifdef2, *endifname;
extern int opt, wantelses, inifdef, context, status, anychange;
-extern char *tempfile, **diffargv;
+extern char *tempfiles[], **diffargv;
extern char *file1, *file2, *efile1, *efile2;
extern struct stat stb1, stb2;
-extern char diffh[], diff[], pr[];
+extern const char *diffh, *diff, *pr;
void *emalloc(size_t);
void *erealloc(void *, size_t);
char *splice(char *, char *);
-char *copytemp(void);
+char *copytemp(const char *, int);
void diffdir(char **);
void diffreg(void);
int max(int, int);