diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-04-04 16:38:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-04-04 16:38:09 (GMT) |
| commit | ab967416122c5aacc321ed5abdbc48de82127315 (patch) | |
| tree | 0ee0e77da17cba2d94f4b372dcfe3eae6b59f369 /Include | |
| parent | 7fe73a17c52dabc6e0ee675e92392be488386b71 (diff) | |
| download | cpython-ab967416122c5aacc321ed5abdbc48de82127315.zip cpython-ab967416122c5aacc321ed5abdbc48de82127315.tar.gz cpython-ab967416122c5aacc321ed5abdbc48de82127315.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')
| -rw-r--r-- | Include/object.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Include/object.h b/Include/object.h index 13795cd..c71bca6 100644 --- a/Include/object.h +++ b/Include/object.h @@ -651,13 +651,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. |