summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2009-04-04 15:54:25 (GMT)
committerMatthias Klose <doko@ubuntu.com>2009-04-04 15:54:25 (GMT)
commit9247e7235999af42c2dba78c9b21dc46f972d718 (patch)
treedce356b5cd881ed4130dd8082fa3b6495d1a03b7 /Include
parent23cafd27cfd45f143c21a61319d230acc5ecf0ea (diff)
downloadcpython-9247e7235999af42c2dba78c9b21dc46f972d718.zip
cpython-9247e7235999af42c2dba78c9b21dc46f972d718.tar.gz
cpython-9247e7235999af42c2dba78c9b21dc46f972d718.tar.bz2
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. ........
Diffstat (limited to 'Include')
-rw-r--r--Include/object.h12
1 files changed, 7 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.