commit 9abd7158d7d10b2b6a6b786c5ef0d428f690e37d
author Ken Takata <kentkt@csc.jp> Sat Aug 10 09:44:20 2024 +0200
committer Christian Brabandt <cb@256bit.org> Sat Aug 10 09:44:20 2024 +0200
tree 0a517d522ac273f3523a2435cb7b14f2dc9a9ef8
parent 181fda18e98620144a0e82a5b5a80dc47448af20

patch 9.1.0668: build-error with python3.12 and stable ABI

Problem:  build-error with python3.12 and stable ABI (zdohnal)
Solution: Add type casts, define Py_INCREF for Python3.12 and higher
          (Ken Takata)

fixes: #15460

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>

src/if_python3.c

diff --git a/src/if_python3.c b/src/if_python3.c
index 96c9497..ac817bd 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -219,6 +219,17 @@
 # define PyObject_GetItem py3_PyObject_GetItem
 # define PyObject_IsTrue py3_PyObject_IsTrue
 # define PyModule_GetDict py3_PyModule_GetDict
+# if defined(USE_LIMITED_API) \
+    && (Py_LIMITED_API+0 >= 0x030c0000 || defined(Py_REF_DEBUG))
+#  undef Py_INCREF
+#  if Py_LIMITED_API+0 >= 0x030a00A7
+#   define _Py_IncRef py3__Py_IncRef
+#   define Py_INCREF _Py_IncRef
+#  else
+#   define Py_IncRef py3_Py_IncRef
+#   define Py_INCREF Py_IncRef
+#  endif
+# endif
 # ifdef USE_LIMITED_API
 #  define Py_CompileString py3_Py_CompileString
 #  define PyEval_EvalCode py3_PyEval_EvalCode
@@ -391,6 +402,15 @@
 static void (*py3_PyErr_SetString)(PyObject *, const char *);
 static void (*py3_PyErr_SetObject)(PyObject *, PyObject *);
 static int (*py3_PyErr_ExceptionMatches)(PyObject *);
+# if defined(USE_LIMITED_API) \
+    && (Py_LIMITED_API+0 >= 0x030c0000 || defined(Py_REF_DEBUG))
+#  if Py_LIMITED_API+0 >= 0x030a00A7
+#   define _Py_IncRef py3__Py_IncRef
+static void (*py3__Py_IncRef)(PyObject *);
+#  else
+static void (*py3_Py_IncRef)(PyObject *);
+#  endif
+# endif
 # ifdef USE_LIMITED_API
 static PyObject* (*py3_Py_CompileString)(const char *, const char *, int);
 static PyObject* (*py3_PyEval_EvalCode)(PyObject *co, PyObject *globals, PyObject *locals);
@@ -598,6 +618,14 @@
     {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString},
     {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject},
     {"PyErr_ExceptionMatches", (PYTHON_PROC*)&py3_PyErr_ExceptionMatches},
+# if defined(USE_LIMITED_API) \
+    && (Py_LIMITED_API+0 >= 0x030c0000 || defined(Py_REF_DEBUG))
+#  if Py_LIMITED_API+0 >= 0x030a00A7
+    {"_Py_IncRef", (PYTHON_PROC*)&py3__Py_IncRef},
+#  else
+    {"Py_IncRef", (PYTHON_PROC*)&py3_Py_IncRef},
+#  endif
+# endif
 # ifdef USE_LIMITED_API
     {"Py_CompileString", (PYTHON_PROC*)&py3_Py_CompileString},
     {"PyEval_EvalCode", (PYTHON_PROC*)&PyEval_EvalCode},
@@ -774,6 +802,20 @@
 #  define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op))
 # endif
 
+# if defined(USE_LIMITED_API) \
+    && (Py_LIMITED_API+0 >= 0x030c0000 || defined(Py_REF_DEBUG))
+    static inline void
+py3__Py_XINCREF(PyObject *op)
+{
+    if (op != NULL)
+    {
+	Py_INCREF(op);
+    }
+}
+#  undef Py_XINCREF
+#  define Py_XINCREF(op) py3__Py_XINCREF(_PyObject_CAST(op))
+# endif
+
 # if PY_VERSION_HEX >= 0x030900b0
     static inline int
 py3_PyType_HasFeature(PyTypeObject *type, unsigned long feature)
@@ -1079,7 +1121,7 @@
 
 #ifdef USE_LIMITED_API
 # define DESTRUCTOR_FINISH(self) \
-    ((freefunc)PyType_GetSlot(Py_TYPE(self), Py_tp_free))((PyObject*)self)
+    ((freefunc)PyType_GetSlot(Py_TYPE((PyObject*)self), Py_tp_free))((PyObject*)self)
 #else
 # define DESTRUCTOR_FINISH(self) Py_TYPE(self)->tp_free((PyObject*)self)
 #endif