Mercurial > vim

changeset 4047:562bbee33aa4 v7.3.778

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.778 Problem: Compiler error for adding up two pointers. (Titov Anatoly) Solution: Add a type cast. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Wed, 23 Jan 2013 16:19:23 +0100
parents 17d23766632f
children 8725ba50d490
files src/mbyte.c src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4325,7 +4325,8 @@ get_iconv_import_func(HINSTANCE hInst, c
 	{
 	    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;
 	}
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    778,
+/**/
     777,
 /**/
     776,