diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-01-24 21:39:42 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-01-24 21:39:42 +0200 |
| commit | 675f2f8f903b83934e0b0cc0d62f12cee25270d2 (patch) | |
| tree | 373ede49029105c7e07fef007ec24fff4a462ef2 /Include/modsupport.h | |
| parent | 067cbd02bf2d9dba35fb73edc57afecc759411fd (diff) | |
| parent | 3831b0a0660621209ee3820e7a2752e69273aa4b (diff) | |
| download | cpython-git-675f2f8f903b83934e0b0cc0d62f12cee25270d2.tar.gz | |
Issue #29083: Fixed the declaration of some public API functions.
PyArg_VaParse() and PyArg_VaParseTupleAndKeywords() were not available in
limited API. PyArg_ValidateKeywordArguments(), PyArg_UnpackTuple() and
Py_BuildValue() were not available in limited API of version < 3.3 when
PY_SSIZE_T_CLEAN is defined.
Diffstat (limited to 'Include/modsupport.h')
| -rw-r--r-- | Include/modsupport.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Include/modsupport.h b/Include/modsupport.h index e464a1cad0..7f4160e5ba 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.h @@ -15,10 +15,8 @@ extern "C" { #define PyArg_Parse _PyArg_Parse_SizeT #define PyArg_ParseTuple _PyArg_ParseTuple_SizeT #define PyArg_ParseTupleAndKeywords _PyArg_ParseTupleAndKeywords_SizeT -#ifndef Py_LIMITED_API #define PyArg_VaParse _PyArg_VaParse_SizeT #define PyArg_VaParseTupleAndKeywords _PyArg_VaParseTupleAndKeywords_SizeT -#endif /* !Py_LIMITED_API */ #define Py_BuildValue _Py_BuildValue_SizeT #define Py_VaBuildValue _Py_VaBuildValue_SizeT #ifndef Py_LIMITED_API @@ -42,11 +40,15 @@ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...); PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, const char *, char **, ...); +PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); +PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, + const char *, char **, va_list); +#endif PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...); PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...); PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); -#endif + #ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyArg_UnpackStack( @@ -60,10 +62,6 @@ PyAPI_FUNC(int) _PyArg_UnpackStack( PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs); PyAPI_FUNC(int) _PyArg_NoStackKeywords(const char *funcname, PyObject *kwnames); PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args); - -PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); -PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, - const char *, char **, va_list); #endif PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list); |