summaryrefslogtreecommitdiff
path: root/gnu/dist/cvs/diff
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2004-04-16 03:51:39 +0000
committeritojun <itojun@NetBSD.org>2004-04-16 03:51:39 +0000
commit47d72b73de075dd9c3d1d3908cd5ead02a19fa15 (patch)
treef84a1890357ea366ad9f8000437d5e4e7701ae76 /gnu/dist/cvs/diff
parentee00feaab98a967a5c1a6598f4ceeede4709c578 (diff)
CVS 1.11.15
Diffstat (limited to 'gnu/dist/cvs/diff')
-rw-r--r--gnu/dist/cvs/diff/ChangeLog5
-rw-r--r--gnu/dist/cvs/diff/diff.c4
-rw-r--r--gnu/dist/cvs/diff/diffrun.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/gnu/dist/cvs/diff/ChangeLog b/gnu/dist/cvs/diff/ChangeLog
index 336d1123412..dbbea3f3be0 100644
--- a/gnu/dist/cvs/diff/ChangeLog
+++ b/gnu/dist/cvs/diff/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-20 Derek Price <derek@ximbiot.com>
+
+ * diff.c (diff_run): Update string arg to const.
+ * diffrun.h: Update prototype to match.
+
2003-07-12 Larry Jones <lawrence.jones@eds.com>
* io.c (find_identical_ends): Update to match current diffutils
diff --git a/gnu/dist/cvs/diff/diff.c b/gnu/dist/cvs/diff/diff.c
index 0b115f2dc21..c1324c66d3b 100644
--- a/gnu/dist/cvs/diff/diff.c
+++ b/gnu/dist/cvs/diff/diff.c
@@ -233,11 +233,13 @@ static struct option const longopts[] =
{0, 0, 0, 0}
};
+
+
int
diff_run (argc, argv, out, callbacks_arg)
int argc;
char *argv[];
- char *out;
+ const char *out;
const struct diff_callbacks *callbacks_arg;
{
int val;
diff --git a/gnu/dist/cvs/diff/diffrun.h b/gnu/dist/cvs/diff/diffrun.h
index 08fbd0db70a..9ee804b2b61 100644
--- a/gnu/dist/cvs/diff/diffrun.h
+++ b/gnu/dist/cvs/diff/diffrun.h
@@ -56,7 +56,7 @@ struct diff_callbacks
/* Run a diff. */
-extern int diff_run DIFFPARAMS((int, char **, char *,
+extern int diff_run DIFFPARAMS((int, char **, const char *,
const struct diff_callbacks *));
/* Run a diff3. */