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 | dad59294657914f605b7c937f2fcb4bbad8184a1 (patch) | |
| tree | 6eb9a20ca21dc8d9373140f7074e11dfe30475f9 | |
| parent | b97cbc6f9c7b6348c50e64108d48ffb75a342c2f (diff) | |
| download | vim-dad59294657914f605b7c937f2fcb4bbad8184a1.tar.gz | |
Problem: Compiler error for adding up two pointers. (Titov Anatoly)
Solution: Add a type cast. (Ken Takata)
| -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 7fdd44dc..b896477f 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 3e7d4639..073c294e 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, |