diff options
| author | Brett Cannon <bcannon@gmail.com> | 2003-10-19 22:58:11 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2003-10-19 22:58:11 (GMT) |
| commit | 4b17e3993b7d4ada586e66ad40a73e12e086645e (patch) | |
| tree | 61479e2baf6f40a3dce139262834fbffac4f7c47 | |
| parent | 26b3a7b82cbeff578bd76be0c6dcc4c572a523c9 (diff) | |
| download | cpython-4b17e3993b7d4ada586e66ad40a73e12e086645e.zip cpython-4b17e3993b7d4ada586e66ad40a73e12e086645e.tar.gz cpython-4b17e3993b7d4ada586e66ad40a73e12e086645e.tar.bz2 | |
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 ...``.
| -rw-r--r-- | Include/boolobject.h | 4 | ||||
| -rw-r--r-- | Include/object.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Include/boolobject.h b/Include/boolobject.h index aa5230a..92d5e27 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 1033445..93249bd 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 |