]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.778 v7.3.778
authorBram Moolenaar <Bram@vim.org>
Wed, 23 Jan 2013 15:19:23 +0000 (16:19 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 23 Jan 2013 15:19:23 +0000 (16:19 +0100)
Problem:    Compiler error for adding up two pointers. (Titov Anatoly)
Solution:   Add a type cast. (Ken Takata)

src/mbyte.c
src/version.c

index 7fdd44dc32c1e8d0115ff1046e3afc395e7abfb6..b896477fce88218176919de10106d5fb0883ea04 100644 (file)
@@ -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;
        }
index 3e7d4639ee824a306a483b5351cb2b9d87563440..073c294eddea8ec549cb6fee244fd28c3c7093ef 100644 (file)
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    778,
 /**/
     777,
 /**/