diff options
author | Bram Moolenaar <Bram@vim.org> | 2011-04-02 14:44:55 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2011-04-02 14:44:55 +0200 |
commit | 10d77eb6aca0dd4d6fbf43e1fc3f3e2204f75177 (patch) | |
tree | becf2530ea9a0d66600a8fdd2a543acef6b62bf1 | |
parent | e0659a680c623f2107017313195a99fa786371ab (diff) | |
download | vim-git-10d77eb6aca0dd4d6fbf43e1fc3f3e2204f75177.tar.gz |
updated for version 7.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.c | 2 | ||||
-rw-r--r-- | src/xxd/xxd.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c index 7d6a5828f..507c41d2b 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 b39f4d436..4d843dd62 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; } + } } } |