From 939e0db21a5145d6a84eb8922ba3dc3a14fb4572 Mon Sep 17 00:00:00 2001

From: Zdenek Dohnal <zdohnal@redhat.com>

Date: Wed, 12 Jul 2023 13:13:38 +0200

Subject: [PATCH] if_python3.c: Fix building dynamic Python3 interpreter

There are new extern global variables defined in python3 development

files, which types are within python3 library, so they break dynamic

python3 interpret Vim plugin.

Since the variables are used in macro `Py_SIZE` which is used in other

python3 headers, the dummy variables have to defined before including

Python.h.

---

 src/if_python3.c | 11 +++++++++--

 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/if_python3.c b/src/if_python3.c

index 240b88fac..f6704a31e 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 <Python.h>

@@ -270,7 +272,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

@@ -448,7 +449,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);

@@ -624,6 +628,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},

-- 

2.41.0