# HG changeset patch # User Bram Moolenaar # Date 1301748295 -7200 # Node ID d0cae598360945a425859bf8acf22923c29501f4 # Parent 6e042e124c4ed2bcb593517c7442f220b627e4b9 updated for version 7.3.153 Problem: Compiler warning for ambiguous else, missing prototype. Solution: Add braces. (Dominique Pelle) Add prototype for die(). diff --git a/src/version.c b/src/version.c --- 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 --- 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; } + } } }