summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-09-08 23:24:14 +0200
committerBram Moolenaar <Bram@vim.org>2011-09-08 23:24:14 +0200
commit9f1188152f06e925e1272a9588fb9b95d8344a75 (patch)
treeef151a0fed4c5585f8cdbbcb12b14e2018c77175
parent868272f58e765e98d1f3f7e870434eea27eef6ee (diff)
downloadvim-git-9f1188152f06e925e1272a9588fb9b95d8344a75.tar.gz
updated for version 7.3.303v7.3.303
Problem: Compilation error. Solution: Correct return type from int to pid_t. (Danek Duvall)
-rw-r--r--src/os_unix.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 8dcf8c7d0..018c49f98 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -159,7 +159,7 @@ typedef union wait waitstatus;
#else
typedef int waitstatus;
#endif
-static int wait4pid __ARGS((pid_t, waitstatus *));
+static pid_t wait4pid __ARGS((pid_t, waitstatus *));
static int WaitForChar __ARGS((long));
#if defined(__BEOS__)
diff --git a/src/version.c b/src/version.c
index d2d0d2c4a..a162e234f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 303,
+/**/
302,
/**/
301,