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
........

diff --git a/Include/object.h b/Include/object.h
index 13795cddcfec3ff649ea8207ad88fe02f809cabc..c71bca64be7de4476ac875cb79ceb55ec325ae31 100644 (file)
--- 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.