revert r71159 since it broke the build

2009-04-04 16:05:51 +00:00 · 2009-04-04 16:05:51 +00:00 · ea0d7444c8
parent 8212a82371
commit ea0d7444c8
2 changed files with 5 additions and 9 deletions
--- a/Include/object.h
+++ b/Include/object.h
@ -749,13 +749,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)
+		_Py_Dealloc((PyObject *)(op))

 /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
 * and tp_dealloc implementatons.
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -207,8 +207,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
 -------