[Python-checkins] r71170 - in python/branches/py3k: Include/object.h

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Apr  4 18:38:09 2009
New Revision: 71170

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Include/object.h

Modified: python/branches/py3k/Include/object.h
==============================================================================
--- python/branches/py3k/Include/object.h	(original)
+++ python/branches/py3k/Include/object.h	Sat Apr  4 18:38:09 2009
@@ -651,13 +651,11 @@
 	((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.