aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2003-10-26 04:20:19 +0000
committerPeter Wemm <peter@FreeBSD.org>2003-10-26 04:20:19 +0000
commitbed00252eb029fa519b0db9a0291af75edc99cd1 (patch)
tree72bf1245e76d51c26f87a9665c517adc20e95ab0 /gnu
parent59a2e5b3fadce55076e39178e7524c3e08119f2d (diff)
downloadsrc-bed00252eb029fa519b0db9a0291af75edc99cd1.tar.gz
src-bed00252eb029fa519b0db9a0291af75edc99cd1.zip
Since I'm having so much fun with const, beat my head against the wall
some more. Make this compile cleanly.
Notes
Notes: svn path=/head/; revision=121535
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/patch/backupfile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/usr.bin/patch/backupfile.c b/gnu/usr.bin/patch/backupfile.c
index c81749b2446b..94a615de5f7c 100644
--- a/gnu/usr.bin/patch/backupfile.c
+++ b/gnu/usr.bin/patch/backupfile.c
@@ -76,7 +76,7 @@ enum backup_type backup_type = none;
to numbered) backup file name. */
char *simple_backup_suffix = "~";
-int argmatch(char *_arg, char **_optlist);
+int argmatch(char *_arg, const char **_optlist);
const char *basename(const char *_name);
char *dirname(const char *_path);
static char *concat(const char *_str1, const char *_str2);
@@ -264,7 +264,7 @@ dirname(const char *path)
or -2 if it is ambiguous (is a prefix of more than one element). */
int
-argmatch(char *arg, char **optlist)
+argmatch(char *arg, const char **optlist)
{
int i; /* Temporary index in OPTLIST. */
int arglen; /* Length of ARG. */
@@ -345,7 +345,7 @@ get_version(char *version)
void
addext(char *filename, char *ext, int e)
{
- char *s = basename (filename);
+ char *s = (char *)(uintptr_t)(const void *)basename (filename);
int slen = strlen (s), extlen = strlen (ext);
long slen_max = -1;