summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-04-02 14:44:55 +0200
committerBram Moolenaar <bram@vim.org>2011-04-02 14:44:55 +0200
commit7ff8e66d302ac2261b327c32395f7b5f85c0f060 (patch)
tree5ff12eb6c16c9c4147ba8be9a697860a19d7f8d0
parent94b32cc7fca5608c49ec88180dee1c9ada0a3774 (diff)
downloadvim-7ff8e66d302ac2261b327c32395f7b5f85c0f060.tar.gz
updated for version 7.3.153v7.3.153v7-3-153
Problem: Compiler warning for ambiguous else, missing prototype. Solution: Add braces. (Dominique Pelle) Add prototype for die().
-rw-r--r--src/version.c2
-rw-r--r--src/xxd/xxd.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c
index 7d6a5828..507c41d2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 153,
+/**/
152,
/**/
151,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index b39f4d43..4d843dd6 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -210,6 +210,7 @@ char osver[] = "";
/* Let's collect some prototypes */
/* CodeWarrior is really picky about missing prototypes */
static void exit_with_usage __P((void));
+static void die __P((int));
static int huntype __P((FILE *, FILE *, FILE *, int, int, long));
static void xxdline __P((FILE *, char *, int));
@@ -689,6 +690,7 @@ main(argc, argv)
while (s--)
if (getc(fp) == EOF)
+ {
if (ferror(fp))
{
die(2);
@@ -698,6 +700,7 @@ main(argc, argv)
fprintf(stderr, "%s: sorry cannot seek.\n", pname);
return 4;
}
+ }
}
}