From 08c5c0bb552683c3605a72e6dbc0628c84d934db Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 4 Apr 2009 16:10:42 +0000 Subject: [PATCH] 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 ........ --- Include/object.h | 12 +++++------- Misc/NEWS | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Include/object.h b/Include/object.h index a5f769e6247..b02689cc4a6 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. diff --git a/Misc/NEWS b/Misc/NEWS index 4ca5e26c76e..09190a0b900 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -92,8 +92,6 @@ Core and Builtins - Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with short file names. -- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings. - Library -------