Modify the Py_RETURN_* macros to be of the form ``do {...} while (0)`` in order

to handle situations like ``if (foo) Py_RETURN_NONE else ...``.

Include/boolobject.h

@@ -24,8 +24,8 @@ PyAPI_DATA(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct;
 #define Py_True ((PyObject *) &_Py_TrueStruct)
 
 /* Macros for returning Py_True or Py_False, respectively */
-#define Py_RETURN_TRUE {Py_INCREF(Py_True); return Py_True;}
-#define Py_RETURN_FALSE {Py_INCREF(Py_False); return Py_False;}
+#define Py_RETURN_TRUE do {Py_INCREF(Py_True); return Py_True;} while (0)
+#define Py_RETURN_FALSE do {Py_INCREF(Py_False); return Py_False;} while (0)
 
 /* Function to return a bool from a C long */
 PyAPI_FUNC(PyObject *) PyBool_FromLong(long);

Include/object.h

@@ -634,7 +634,7 @@ PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
 #define Py_None (&_Py_NoneStruct)
 
 /* Macro for returning Py_None from a function */
-#define Py_RETURN_NONE {Py_INCREF(Py_None); return Py_None;}
+#define Py_RETURN_NONE do {Py_INCREF(Py_None); return Py_None;} while (0)
 
 /*
 Py_NotImplemented is a singleton used to signal that an operation is