From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 19 Oct 2003 22:58:11 +0000 (+0000)
Subject: Modify the Py_RETURN_* macros to be of the form ``do {...} while (0)`` in order
X-Git-Tag: v2.4a1~1411
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b17e3993b7d4ada586e66ad40a73e12e086645e;p=python

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 ...``.
---

diff --git a/Include/boolobject.h b/Include/boolobject.h
index aa5230a2e6..92d5e27ab4 100644
--- a/Include/boolobject.h
+++ b/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);
diff --git a/Include/object.h b/Include/object.h
index 10334456f5..93249bd097 100644
--- a/Include/object.h
+++ b/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