diff options
author | peter <peter@FreeBSD.org> | 2003-01-21 22:01:38 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2003-01-21 22:01:38 +0000 |
commit | b1cdaf481542cc4eec93f869c5a76737741f87be (patch) | |
tree | d46a687eb1c764470d9e1e965a4bbadec912e6bb /contrib/cvs/src/diff.c | |
parent | a98d2f0a90265300b9d900f4c0a76c1373ea1ff2 (diff) | |
download | FreeBSD-src-b1cdaf481542cc4eec93f869c5a76737741f87be.zip FreeBSD-src-b1cdaf481542cc4eec93f869c5a76737741f87be.tar.gz |
Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainline
Diffstat (limited to 'contrib/cvs/src/diff.c')
-rw-r--r-- | contrib/cvs/src/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c index edf1af4..b29bc8f 100644 --- a/contrib/cvs/src/diff.c +++ b/contrib/cvs/src/diff.c @@ -450,7 +450,7 @@ diff (argc, argv) /* start the recursion processor */ err = start_recursion (diff_fileproc, diff_filesdoneproc, diff_dirproc, diff_dirleaveproc, NULL, argc, argv, local, - which, 0, LOCK_READ, (char *) NULL, 1); + which, 0, CVS_LOCK_READ, (char *) NULL, 1); } /* clean up */ |