diff --git a/src/if_python3.c b/src/if_python3.c index 06c02ce67c..0a0d31e698 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -68,6 +68,8 @@ #endif #define PY_SSIZE_T_CLEAN +#define PyLong_Type (*py3_PyLong_Type) +#define PyBool_Type (*py3_PyBool_Type) #include @@ -271,7 +273,6 @@ static HINSTANCE hinstPy3 = 0; // Instance of python.dll # define PyFloat_Type (*py3_PyFloat_Type) # define PyNumber_Check (*py3_PyNumber_Check) # define PyNumber_Long (*py3_PyNumber_Long) -# define PyBool_Type (*py3_PyBool_Type) # define PyErr_NewException py3_PyErr_NewException # ifdef Py_DEBUG # define _Py_NegativeRefcount py3__Py_NegativeRefcount @@ -449,7 +450,10 @@ static PyTypeObject* py3_PyType_Type; static PyTypeObject* py3_PyStdPrinter_Type; static PyTypeObject* py3_PySlice_Type; static PyTypeObject* py3_PyFloat_Type; -static PyTypeObject* py3_PyBool_Type; +PyTypeObject* py3_PyBool_Type; +# if PY_VERSION_HEX >= 0x030c00b0 +PyTypeObject* py3_PyLong_Type; +# endif static int (*py3_PyNumber_Check)(PyObject *); static PyObject* (*py3_PyNumber_Long)(PyObject *); static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); @@ -625,6 +629,9 @@ static struct {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, +# if PY_VERSION_HEX >= 0x030c00b0 + {"PyLong_Type", (PYTHON_PROC*)&py3_PyLong_Type}, +# endif {"PyNumber_Check", (PYTHON_PROC*)&py3_PyNumber_Check}, {"PyNumber_Long", (PYTHON_PROC*)&py3_PyNumber_Long}, {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException}, diff --git a/src/version.c b/src/version.c index d38e9b46f7..311bb8c733 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1709, /**/ 1708, /**/