summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff/diff.c
diff options
context:
space:
mode:
authorjtc <jtc@NetBSD.org>1993-09-29 21:37:02 +0000
committerjtc <jtc@NetBSD.org>1993-09-29 21:37:02 +0000
commitac21a0e171d9b7161e91467775af3b7213ad7502 (patch)
tree629d6f045c9baf006133cbb7dab9a6668f793c3e /gnu/usr.bin/diff/diff.c
parent81c776a8e40880f27728682bf653ff4d15da1ef7 (diff)
Upgrade to GNU Diffutils 2.5.
No user visable changes, I just want to keep things in sync to make sure that integrating future versions of diffutils will continue to be relatively painless.
Diffstat (limited to 'gnu/usr.bin/diff/diff.c')
-rw-r--r--gnu/usr.bin/diff/diff.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/usr.bin/diff/diff.c b/gnu/usr.bin/diff/diff.c
index bf836e75bc2..d5e7f8c09be 100644
--- a/gnu/usr.bin/diff/diff.c
+++ b/gnu/usr.bin/diff/diff.c
@@ -18,7 +18,7 @@ along with GNU DIFF; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef lint
-static char *rcsid = "$Id: diff.c,v 1.4 1993/09/16 17:39:07 jtc Exp $";
+static char *rcsid = "$Id: diff.c,v 1.5 1993/09/29 21:37:04 jtc Exp $";
#endif
/* GNU DIFF was written by Mike Haertel, David Hayes,
@@ -28,7 +28,6 @@ static char *rcsid = "$Id: diff.c,v 1.4 1993/09/16 17:39:07 jtc Exp $";
#include "diff.h"
#include "getopt.h"
#include "fnmatch.h"
-#include "system.h"
#ifndef DEFAULT_WIDTH
#define DEFAULT_WIDTH 130
@@ -154,7 +153,7 @@ add_exclude_file (name)
for (p = f.buffer, lim = p + f.buffered_chars; p < lim; p = q)
{
- q = memchr (p, '\n', lim - p);
+ q = (char *) memchr (p, '\n', lim - p);
if (!q)
q = lim;
*q++ = 0;