From ccd55a2c66ccad56efb56a57f629414c2b2ba510 Mon Sep 17 00:00:00 2001 From: otto Date: Sun, 20 Jun 2004 18:47:45 +0000 Subject: 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@ --- usr.bin/diff/diff.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'usr.bin/diff/diff.h') 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 +#include + /* * 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); -- cgit v1.2.3-59-g8ed1b