From 26b3a7b82cbeff578bd76be0c6dcc4c572a523c9 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 19 Oct 2003 21:31:43 +0000
Subject: Modified the Py_RETURN_* macros by having the statements surrounded
 by {} in order to prevent any unexpected surprises from someone using them in
 a conditional without using curly braces (e.g., ``if (foo) Py_RETURN_TRUE``.

---
 Include/boolobject.h | 4 ++--
 Include/object.h     | 2 +-
 Misc/NEWS            | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Include/boolobject.h b/Include/boolobject.h
index 7c4939b..aa5230a 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 {Py_INCREF(Py_True); return Py_True;}
+#define Py_RETURN_FALSE {Py_INCREF(Py_False); return Py_False;}
 
 /* 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 8fdd4dc..1033445 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 {Py_INCREF(Py_None); return Py_None;}
 
 /*
 Py_NotImplemented is a singleton used to signal that an operation is
diff --git a/Misc/NEWS b/Misc/NEWS
index 87a82e9..52ed529 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -155,6 +155,9 @@ Build
 C API
 -----
 
+- Added three new macros: Py_RETURN_NONE, Py_RETURN_TRUE, and Py_RETURN_FALSE.
+  Each return the singleton they mention after Py_INCREF()ing them.
+
 - Added a new function, PyTuple_Pack(n, ...) for constructing tuples from a
   variable length argument list of Python objects without having to invoke
   the more complex machinery of Py_BuildValue().  PyTuple_Pack(3, a, b, c)
-- 
cgit v0.12

