0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

updated for version 7.3.967

Problem:    Build fails on Mac OSX. (Greg Novack)
Solution:   Undefine clear().
This commit is contained in:
Bram Moolenaar 2013-05-17 21:20:17 +02:00
parent ad3b366c82
commit 9e74e30b5f
2 changed files with 13 additions and 7 deletions

View File

@ -474,7 +474,7 @@ VimEval(PyObject *self UNUSED, PyObject *args UNUSED)
static PyObject *ConvertToPyObject(typval_T *); static PyObject *ConvertToPyObject(typval_T *);
static PyObject * static PyObject *
VimEvalPy(PyObject *self UNUSED, PyObject *args UNUSED) VimEvalPy(PyObject *self UNUSED, PyObject *args)
{ {
char *expr; char *expr;
typval_T *our_tv; typval_T *our_tv;
@ -547,9 +547,9 @@ typedef void (*destructorfun)(void *);
typedef int (*traversefun)(void *, visitproc, void *); typedef int (*traversefun)(void *, visitproc, void *);
typedef int (*clearfun)(void **); typedef int (*clearfun)(void **);
/* Main purpose of this object is removing the need for do python initialization /* Main purpose of this object is removing the need for do python
* (i.e. PyType_Ready and setting type attributes) for a big bunch of objects. * initialization (i.e. PyType_Ready and setting type attributes) for a big
*/ * bunch of objects. */
typedef struct typedef struct
{ {
@ -598,6 +598,11 @@ IterTraverse(PyObject *self, visitproc visit, void *arg)
return 0; return 0;
} }
/* Mac OSX defines clear() somewhere. */
#ifdef clear
# undef clear
#endif
static int static int
IterClear(PyObject *self) IterClear(PyObject *self)
{ {
@ -3287,9 +3292,8 @@ BufMapIterNext(PyObject **buffer)
else if (!(next = BufferNew(((BufferObject *)(r))->buf->b_next))) else if (!(next = BufferNew(((BufferObject *)(r))->buf->b_next)))
return NULL; return NULL;
*buffer = next; *buffer = next;
/* Do not increment reference: we no longer hold it (decref), but whoever on /* Do not increment reference: we no longer hold it (decref), but whoever
* other side will hold (incref). Decref+incref = nothing. * on other side will hold (incref). Decref+incref = nothing. */
*/
return r; return r;
} }

View File

@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
967,
/**/ /**/
966, 966,
/**/ /**/