diff options
| author | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
| commit | 3dc96f7243ece1d1f7f87b03334f840415e0db63 (patch) | |
| tree | 15f00bd8ebd718713d8c0a8707ebebfced99c550 /contrib/cvs/diff/diff.c | |
| parent | cf46dfb750863d760d19b9858b0a336b158275da (diff) | |
| download | FreeBSD-src-3dc96f7243ece1d1f7f87b03334f840415e0db63.zip FreeBSD-src-3dc96f7243ece1d1f7f87b03334f840415e0db63.tar.gz | |
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
Diffstat (limited to 'contrib/cvs/diff/diff.c')
| -rw-r--r-- | contrib/cvs/diff/diff.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/cvs/diff/diff.c b/contrib/cvs/diff/diff.c index ebd78ae..0b115f2 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 <signal.h> #include "getopt.h" -#include "fnmatch.h" + +#ifdef HAVE_FNMATCH +# include <fnmatch.h> /* 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 |
