diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-02-11 16:00:35 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-02-11 16:00:35 +0100 |
commit | 3b5226121ddefaa51c1dbb844bfb7124386fe4a8 (patch) | |
tree | 61663c6b769a033a0607e6e1655920a319f1cf65 | |
parent | 12a0f22340ef1b0fa9a4e96d918e282c3d9c2c4e (diff) | |
download | vim-git-3b5226121ddefaa51c1dbb844bfb7124386fe4a8.tar.gz |
updated for version 7.4.174v7.4.174
Problem: Compiler warnings for Python interface. (Tony Mechelynck)
Solution: Add type casts, initialize variable.
-rw-r--r-- | src/if_py_both.h | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index dd7e82a71..7c205f8c4 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2368,7 +2368,7 @@ ListAssSlice(ListObject *self, Py_ssize_t first, PyInt numreplaced = 0; PyInt numadded = 0; PyInt size; - listitem_T **lis; + listitem_T **lis = NULL; size = ListLength(self); @@ -2503,8 +2503,8 @@ ListAssSlice(ListObject *self, Py_ssize_t first, { Py_DECREF(iterator); PyErr_FORMAT(PyExc_ValueError, - N_("attempt to assign sequence of size greater then %d " - "to extended slice"), slicelen); + N_("attempt to assign sequence of size greater then %ld " + "to extended slice"), (long)slicelen); list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli); PyMem_Free(lis); return -1; @@ -2516,8 +2516,8 @@ ListAssSlice(ListObject *self, Py_ssize_t first, if (step != 1 && i != slicelen) { PyErr_FORMAT2(PyExc_ValueError, - N_("attempt to assign sequence of size %d to extended slice " - "of size %d"), i, slicelen); + N_("attempt to assign sequence of size %ld to extended slice " + "of size %ld"), (long)i, (long)slicelen); list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli); PyMem_Free(lis); return -1; diff --git a/src/version.c b/src/version.c index f0f743693..dfecc7c9f 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 174, +/**/ 173, /**/ 172, |