summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-02-29 13:58:47 +0100
committerBram Moolenaar <bram@vim.org>2012-02-29 13:58:47 +0100
commit96a07a19a8ffb9473fac2bdb0cd71c355ea88b50 (patch)
tree4b3599d325e85dba30ed36eec194fd5692f05a5b
parentff950e454a324804552260e9ed92e2076d3e54b4 (diff)
downloadvim-96a07a19a8ffb9473fac2bdb0cd71c355ea88b50.tar.gz
updated for version 7.3.459v7.3.459v7-3-459
Problem: Win32: Warnings for type conversion. Solution: Add type casts. (Mike Williams)
-rw-r--r--src/misc2.c2
-rw-r--r--src/os_win32.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 81838765..d62c771c 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -2074,7 +2074,7 @@ ga_grow(gap, n)
n = gap->ga_growsize;
new_len = gap->ga_itemsize * (gap->ga_len + n);
pp = (gap->ga_data == NULL)
- ? alloc(new_len) : vim_realloc(gap->ga_data, new_len);
+ ? alloc((unsigned)new_len) : vim_realloc(gap->ga_data, new_len);
if (pp == NULL)
return FAIL;
old_len = gap->ga_itemsize * gap->ga_maxlen;
diff --git a/src/os_win32.c b/src/os_win32.c
index 57f004ec..371363bf 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -264,7 +264,7 @@ get_exe_name(void)
static void
unescape_shellxquote(char_u *p, char_u *escaped)
{
- int l = STRLEN(p);
+ int l = (int)STRLEN(p);
int n;
while (*p != NUL)
diff --git a/src/version.c b/src/version.c
index 49e6515a..3c8101bc 100644
--- 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 */
/**/
+ 459,
+/**/
458,
/**/
457,