diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-06-02 23:07:17 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-06-02 23:07:17 (GMT) |
| commit | 47d5e15e502c198358d7d275b82bcfcd2ba21b85 (patch) | |
| tree | 7ae524dac2e1c7212d5b82cb07403621e220ec57 /Include | |
| parent | 107d08fa1db056cb7c391a359022321a447fddbf (diff) | |
| parent | ca829102213c466ffecb1e464be5c8cb3967d961 (diff) | |
| download | cpython-47d5e15e502c198358d7d275b82bcfcd2ba21b85.zip cpython-47d5e15e502c198358d7d275b82bcfcd2ba21b85.tar.gz cpython-47d5e15e502c198358d7d275b82bcfcd2ba21b85.tar.bz2 | |
Issue 24365: Merge 3.5
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/modsupport.h | 9 | ||||
| -rw-r--r-- | Include/moduleobject.h | 24 | ||||
| -rw-r--r-- | Include/typeslots.h | 3 |
3 files changed, 27 insertions, 9 deletions
diff --git a/Include/modsupport.h b/Include/modsupport.h index 21bffb5..829aaf8 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.h @@ -49,9 +49,13 @@ PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); #define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c) #define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c) + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ PyAPI_FUNC(int) PyModule_SetDocString(PyObject *, const char *); PyAPI_FUNC(int) PyModule_AddFunctions(PyObject *, PyMethodDef *); PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def); +#endif #define Py_CLEANUP_SUPPORTED 0x20000 @@ -126,6 +130,8 @@ PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*, PyModule_Create2(module, PYTHON_API_VERSION) #endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ PyAPI_FUNC(PyObject *) PyModule_FromDefAndSpec2(PyModuleDef *def, PyObject *spec, int module_api_version); @@ -136,7 +142,8 @@ PyAPI_FUNC(PyObject *) PyModule_FromDefAndSpec2(PyModuleDef *def, #else #define PyModule_FromDefAndSpec(module, spec) \ PyModule_FromDefAndSpec2(module, spec, PYTHON_API_VERSION) -#endif +#endif /* Py_LIMITED_API */ +#endif /* New in 3.5 */ #ifndef Py_LIMITED_API PyAPI_DATA(char *) _Py_PackageContext; diff --git a/Include/moduleobject.h b/Include/moduleobject.h index dbbf581..229d7fa 100644 --- a/Include/moduleobject.h +++ b/Include/moduleobject.h @@ -30,8 +30,11 @@ PyAPI_FUNC(void) _PyModule_ClearDict(PyObject *); PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*); PyAPI_FUNC(void*) PyModule_GetState(PyObject*); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ PyAPI_FUNC(PyObject *) PyModuleDef_Init(struct PyModuleDef*); PyAPI_DATA(PyTypeObject) PyModuleDef_Type; +#endif typedef struct PyModuleDef_Base { PyObject_HEAD @@ -47,30 +50,35 @@ typedef struct PyModuleDef_Base { NULL, /* m_copy */ \ } +struct PyModuleDef_Slot; +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ typedef struct PyModuleDef_Slot{ int slot; void *value; } PyModuleDef_Slot; +#define Py_mod_create 1 +#define Py_mod_exec 2 + +#ifndef Py_LIMITED_API +#define _Py_mod_LAST_SLOT 2 +#endif + +#endif /* New in 3.5 */ + typedef struct PyModuleDef{ PyModuleDef_Base m_base; const char* m_name; const char* m_doc; Py_ssize_t m_size; PyMethodDef *m_methods; - PyModuleDef_Slot* m_slots; + struct PyModuleDef_Slot* m_slots; traverseproc m_traverse; inquiry m_clear; freefunc m_free; }PyModuleDef; -#define Py_mod_create 1 -#define Py_mod_exec 2 - -#ifndef Py_LIMITED_API -#define _Py_mod_LAST_SLOT 2 -#endif - #ifdef __cplusplus } #endif diff --git a/Include/typeslots.h b/Include/typeslots.h index a89d73b..0ce6a37 100644 --- a/Include/typeslots.h +++ b/Include/typeslots.h @@ -79,4 +79,7 @@ #define Py_am_await 77 #define Py_am_aiter 78 #define Py_am_anext 79 +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ #define Py_tp_finalize 80 +#endif |