- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings.

  (avoiding brown paper typo this time)

diff --git a/Include/object.h b/Include/object.h
index cfca64f9ab6e58d4d368e741f9aacdc732936ade..3d898f905d179acf42b1c2afef33139b641ad03c 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -749,11 +749,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.

diff --git a/Misc/NEWS b/Misc/NEWS
index 13d220279e0e5f4694800eb46d4c689533398214..685c6898856da5de8e258e25432c3159148e668e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -207,6 +207,8 @@ 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
 -------