summaryrefslogtreecommitdiff
path: root/usr.bin/diff/diff.h
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2004-06-20 18:47:46 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2004-06-20 18:47:46 +0000
commit8908ae08ec12426bf0c946b2bb67e4b6a8825518 (patch)
tree8bc32c7daf63de0bcb851ad6fd382c2b3aea622f /usr.bin/diff/diff.h
parent27aab8e947ae47e5ef251b626c74f07b90c6d431 (diff)
Implement -I option: ignore changes matching a set of regexes. From
Jared Yanovich, with twists from millert@ and me. Testing by brad@, sturm@ and pval@. ok millert@
Diffstat (limited to 'usr.bin/diff/diff.h')
-rw-r--r--usr.bin/diff/diff.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index d9af1a94c0e..8d5e70813dd 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.h,v 1.27 2004/03/16 00:40:34 millert Exp $ */
+/* $OpenBSD: diff.h,v 1.28 2004/06/20 18:47:45 otto Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -31,6 +31,9 @@
* @(#)diff.h 8.1 (Berkeley) 6/6/93
*/
+#include <sys/types.h>
+#include <regex.h>
+
/*
* Output format options
*/
@@ -73,9 +76,10 @@ struct excludes {
extern int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
sflag, tflag, Tflag, wflag;
extern int format, context, status;
-extern char *start, *ifdefname, *diffargs, *label;
+extern char *start, *ifdefname, *diffargs, *label, *ignore_pats;
extern struct stat stb1, stb2;
extern struct excludes *excludes_list;
+extern regex_t ignore_re;
char *splice(char *, char *);
int diffreg(char *, char *, int);