summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-02-26 21:43:32 +0100
committerBram Moolenaar <Bram@vim.org>2013-02-26 21:43:32 +0100
commit988232fabba5d5dc154fcb962243a36740f02b12 (patch)
treedeba198f9a1bf56dcf49a17d8931e91911d7acd5
parente17c2603355669a84813f454875d865f38172ff8 (diff)
downloadvim-git-988232fabba5d5dc154fcb962243a36740f02b12.tar.gz
updated for version 7.3.842v7.3.842
Problem: Compiler warning for signed/unsigned pointer. Solution: Add type cast. (Christian Brabandt)
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index d5a41fbce..ad200598b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5170,7 +5170,7 @@ eval7(arg, rettv, evaluate, want_string)
* what follows. So set it here. */
if (rettv->v_type == VAR_UNKNOWN && !evaluate && **arg == '(')
{
- rettv->vval.v_string = vim_strsave("");
+ rettv->vval.v_string = vim_strsave((char_u *)"");
rettv->v_type = VAR_FUNC;
}
diff --git a/src/version.c b/src/version.c
index 6098591c0..f49cd4a0c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 842,
+/**/
841,
/**/
840,