From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 2 Apr 2011 12:44:55 +0000 (+0200)
Subject: updated for version 7.3.153
X-Git-Tag: v7.3.153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10d77eb6aca0dd4d6fbf43e1fc3f3e2204f75177;p=vim

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
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;
 		}
+	    }
 	}
     }