From 10d77eb6aca0dd4d6fbf43e1fc3f3e2204f75177 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 2 Apr 2011 14:44:55 +0200 Subject: [PATCH] updated for version 7.3.153 Problem: Compiler warning for ambiguous else, missing prototype. Solution: Add braces. (Dominique Pelle) Add prototype for die(). --- src/version.c | 2 ++ src/xxd/xxd.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/version.c b/src/version.c index 7d6a5828f..507c41d2b 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 153, /**/ 152, /**/ 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; } + } } } -- 2.50.1