From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Jan 2013 15:19:23 +0000 (+0100)
Subject: updated for version 7.3.778
X-Git-Tag: v7.3.778
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94a8adfdd890f0550f81755b247ca7cc5336ad20;p=vim

updated for version 7.3.778
Problem:    Compiler error for adding up two pointers. (Titov Anatoly)
Solution:   Add a type cast. (Ken Takata)
---

diff --git a/src/mbyte.c b/src/mbyte.c
index 7fdd44dc3..b896477fc 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4325,7 +4325,8 @@ get_iconv_import_func(HINSTANCE hInst, const char *funcname)
 	{
 	    if (IMAGE_SNAP_BY_ORDINAL(pINT->u1.Ordinal))
 		continue;
-	    pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage + pINT->u1.AddressOfData);
+	    pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage
+					+ (UINT_PTR)(pINT->u1.AddressOfData));
 	    if (strcmp(pImpName->Name, funcname) == 0)
 		return (void *)pIAT->u1.Function;
 	}
diff --git a/src/version.c b/src/version.c
index 3e7d4639e..073c294ed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    778,
 /**/
     777,
 /**/