merge heads

This commit is contained in:
Georg Brandl 2013-10-08 20:29:47 +02:00
commit 3328871cac
1 changed files with 0 additions and 3 deletions

View File

@ -51,9 +51,6 @@ PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType;
((Py_TYPE(op) == &_PyWeakref_ProxyType) || \
(Py_TYPE(op) == &_PyWeakref_CallableProxyType))
/* This macro calls PyWeakref_CheckRef() last since that can involve a
function call; this makes it more likely that the function call
will be avoided. */
#define PyWeakref_Check(op) \
(PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op))