diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-01-23 16:19:23 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-01-23 16:19:23 +0100 |
| commit | 94a8adfdd890f0550f81755b247ca7cc5336ad20 (patch) | |
| tree | 81d5f0cb03d2ec5e56aea06ab2faa9d6fd949a7e /src | |
| parent | 3be71ce28d832553a1350b15d9323c30014382c0 (diff) | |
| download | vim-94a8adfdd890f0550f81755b247ca7cc5336ad20.zip | |
updated for version 7.3.778
Problem: Compiler error for adding up two pointers. (Titov Anatoly)
Solution: Add a type cast. (Ken Takata)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbyte.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
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 @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 778, +/**/ 777, /**/ 776, |