From 6361f125fbebb7b3fba759b74fe02de24f44ebf6 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 2 Dec 2002 03:13:37 +0000 Subject: Import cvs-1.11.2.1 as of 2002/12/01 onto vendor branch. This fixes all of the bugs that I know of. We've been running a slightly older version of this on freefall/repoman, where it was afflicted by a silly merge error on my part (fixed). Approved by: re --- contrib/cvs/diff/diff.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'contrib/cvs/diff/diff.c') diff --git a/contrib/cvs/diff/diff.c b/contrib/cvs/diff/diff.c index ebd78aebfd19..0b115f2dc21f 100644 --- a/contrib/cvs/diff/diff.c +++ b/contrib/cvs/diff/diff.c @@ -22,7 +22,12 @@ GNU General Public License for more details. #include "diff.h" #include #include "getopt.h" -#include "fnmatch.h" + +#ifdef HAVE_FNMATCH +# include /* This is supposed to be available on Posix systems */ +#else /* HAVE_FNMATCH */ +# include "fnmatch.h" /* Our substitute */ +#endif /* HAVE_FNMATCH */ #ifndef DEFAULT_WIDTH #define DEFAULT_WIDTH 130 -- cgit v1.2.3