diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-06-11 12:01:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 12:01:47 (GMT) |
| commit | 5cbefa99198729a1d4e93d93f890c066039ee1d2 (patch) | |
| tree | 76cff6b51ef8c34fa9523ae86278e6254572a08c /Include | |
| parent | 9d6171ded5c56679bc295bacffc718472bcb706b (diff) | |
| download | cpython-5cbefa99198729a1d4e93d93f890c066039ee1d2.zip cpython-5cbefa99198729a1d4e93d93f890c066039ee1d2.tar.gz cpython-5cbefa99198729a1d4e93d93f890c066039ee1d2.tar.bz2 | |
Clean up after bpo-33738. (GH-7627)
* Add declarations even if they are overridden by macros.
* Make the declaration and the definition of PyExceptionClass_Name
consistent.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/abstract.h | 6 | ||||
| -rw-r--r-- | Include/pyerrors.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Include/abstract.h b/Include/abstract.h index c1297db..85550a3 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -593,12 +593,11 @@ PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *); /* Returns 1 if the object 'obj' provides iterator protocols, and 0 otherwise. This function always succeeds. */ +PyAPI_FUNC(int) PyIter_Check(PyObject *); #ifndef Py_LIMITED_API #define PyIter_Check(obj) \ ((obj)->ob_type->tp_iternext != NULL && \ (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented) -#else -PyAPI_FUNC(int) PyIter_Check(PyObject *); #endif /* Takes an iterator object and calls its tp_iternext slot, @@ -719,12 +718,11 @@ PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2); /* Returns 1 if obj is an index integer (has the nb_index slot of the tp_as_number structure filled in), and 0 otherwise. */ +PyAPI_FUNC(int) PyIndex_Check(PyObject *); #ifndef Py_LIMITED_API #define PyIndex_Check(obj) \ ((obj)->ob_type->tp_as_number != NULL && \ (obj)->ob_type->tp_as_number->nb_index != NULL) -#else -PyAPI_FUNC(int) PyIndex_Check(PyObject *); #endif /* Returns the object 'o' converted to a Python int, or NULL with an exception diff --git a/Include/pyerrors.h b/Include/pyerrors.h index 5fd981c..5b62658 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -140,11 +140,10 @@ PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *); #define PyExceptionInstance_Check(x) \ PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS) +PyAPI_FUNC(char *) PyExceptionClass_Name(PyObject *); #ifndef Py_LIMITED_API #define PyExceptionClass_Name(x) \ ((char *)(((PyTypeObject *)(x))->tp_name)) -#else - PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *); #endif #define PyExceptionInstance_Class(x) ((PyObject*)((x)->ob_type)) |