diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-05-17 21:20:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-05-17 21:20:17 +0200 |
| commit | 9e74e30b5ff542c26c100c692fa8cf472728b74e (patch) | |
| tree | b7c08585b97a05b0a7d54917b46e15aa809b8525 | |
| parent | ad3b366c8250a6f3c7ac699bc4b0f2e613286089 (diff) | |
| download | vim-git-9e74e30b5ff542c26c100c692fa8cf472728b74e.tar.gz | |
updated for version 7.3.967v7.3.967
Problem: Build fails on Mac OSX. (Greg Novack)
Solution: Undefine clear().
| -rw-r--r-- | src/if_py_both.h | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 280c24841..f982373a1 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -474,7 +474,7 @@ VimEval(PyObject *self UNUSED, PyObject *args UNUSED) static PyObject *ConvertToPyObject(typval_T *); static PyObject * -VimEvalPy(PyObject *self UNUSED, PyObject *args UNUSED) +VimEvalPy(PyObject *self UNUSED, PyObject *args) { char *expr; typval_T *our_tv; @@ -547,9 +547,9 @@ typedef void (*destructorfun)(void *); typedef int (*traversefun)(void *, visitproc, void *); typedef int (*clearfun)(void **); -/* Main purpose of this object is removing the need for do python initialization - * (i.e. PyType_Ready and setting type attributes) for a big bunch of objects. - */ +/* Main purpose of this object is removing the need for do python + * initialization (i.e. PyType_Ready and setting type attributes) for a big + * bunch of objects. */ typedef struct { @@ -598,6 +598,11 @@ IterTraverse(PyObject *self, visitproc visit, void *arg) return 0; } +/* Mac OSX defines clear() somewhere. */ +#ifdef clear +# undef clear +#endif + static int IterClear(PyObject *self) { @@ -3287,9 +3292,8 @@ BufMapIterNext(PyObject **buffer) else if (!(next = BufferNew(((BufferObject *)(r))->buf->b_next))) return NULL; *buffer = next; - /* Do not increment reference: we no longer hold it (decref), but whoever on - * other side will hold (incref). Decref+incref = nothing. - */ + /* Do not increment reference: we no longer hold it (decref), but whoever + * on other side will hold (incref). Decref+incref = nothing. */ return r; } diff --git a/src/version.c b/src/version.c index 97611e487..40d144e85 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 967, +/**/ 966, /**/ 965, |