From 26b3a7b82cbeff578bd76be0c6dcc4c572a523c9 Mon Sep 17 00:00:00 2001 From: Brett Cannon 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 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Include') diff --git a/Include/boolobject.h b/Include/boolobject.h index 7c4939b239..aa5230a2e6 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 8fdd4dc94e..10334456f5 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 -- cgit v1.2.1