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 a5f769e6247b986f299282a72a3e0c91c05a84d3..b02689cc4a6ed3f4e2def65d9f17eb7a2bb75e7a 100644 (file)
--- 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 4ca5e26c76e69da163066dc9d9b8022671a920ec..09190a0b900f148bdb3b44663661dbbcd5369b99 100644 (file)
--- 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
 -------