From 9247e7235999af42c2dba78c9b21dc46f972d718 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 4 Apr 2009 15:54:25 +0000 Subject: Merged revisions 71159 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r71159 | matthias.klose | 2009-04-04 17:51:23 +0200 (Sa, 04 Apr 2009) | 2 lines - Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings. ........ --- Include/object.h | 12 +++++++----- Misc/NEWS | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Include/object.h b/Include/object.h index c71bca6..13795cd 100644 --- a/Include/object.h +++ b/Include/object.h @@ -651,11 +651,13 @@ PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force); ((PyObject*)(op))->ob_refcnt++) #define Py_DECREF(op) \ - if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \ - --((PyObject*)(op))->ob_refcnt != 0) \ - _Py_CHECK_REFCNT(op) \ - else \ - _Py_Dealloc((PyObject *)(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) /* 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 616d43b..0774988 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,8 @@ 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 ------- -- cgit v0.12