Mercurial > vim
changeset 4438:20e30e31bd86 v7.3.967
updated for version 7.3.967
Problem: Build fails on Mac OSX. (Greg Novack)
Solution: Undefine clear().
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 17 May 2013 21:20:17 +0200 |
| parents | eb6ab7e78925 |
| children | e2f76dc2df31 |
| files | src/if_py_both.h src/version.c |
| diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -474,7 +474,7 @@ VimEval(PyObject *self UNUSED, PyObject 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 v 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; }