summaryrefslogtreecommitdiffstats
path: root/Include/object.h
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-04-04 16:10:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-04-04 16:10:42 (GMT)
commit08c5c0bb552683c3605a72e6dbc0628c84d934db (patch)
treee9a3659eccb375c1108d2c14ab371755290aea6d /Include/object.h
parentdb5d6dc6de58a911bffdd8936b4d0eca08d5143c (diff)
downloadcpython-08c5c0bb552683c3605a72e6dbc0628c84d934db.zip
cpython-08c5c0bb552683c3605a72e6dbc0628c84d934db.tar.gz
cpython-08c5c0bb552683c3605a72e6dbc0628c84d934db.tar.bz2
Merged revisions 71163 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71163 | benjamin.peterson | 2009-04-04 11:05:51 -0500 (Sat, 04 Apr 2009) | 1 line revert r71159 since it broke the build ........
Diffstat (limited to 'Include/object.h')
-rw-r--r--Include/object.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/Include/object.h b/Include/object.h
index a5f769e..b02689c 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -746,13 +746,11 @@ PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
((PyObject*)(op))->ob_refcnt++)
#define Py_DECREF(op) \
- do { \
- if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \
- --((PyObject*)(op))->ob_refcnt != 0) \
- _Py_CHECK_REFCNT(op) \
- else \
- _Py_Dealloc((PyObject *)(op)) \
- } while (0)
+ if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \
+ --((PyObject*)(op))->ob_refcnt != 0) \
+ _Py_CHECK_REFCNT(op) \
+ else \
+ _Py_Dealloc((PyObject *)(op))
/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
* and tp_dealloc implementatons.