Fix 'redefinition; different linkage' errors with cp313-win (#115)

cdce8p · web-flow · commit 6d8c17a2d547 · 2024-10-14T20:40:27.000+02:00
diff --git a/pythoncapi_compat.h b/pythoncapi_compat.h
@@ -1537,7 +1537,7 @@ static inline int PyUnicode_Equal(PyObject *str1, PyObject *str2)
     }
 
 #if PY_VERSION_HEX >= 0x030d0000 && !defined(PYPY_VERSION)
-    extern int _PyUnicode_Equal(PyObject *str1, PyObject *str2);
+    PyAPI_FUNC(int) _PyUnicode_Equal(PyObject *str1, PyObject *str2);
 
     return _PyUnicode_Equal(str1, str2);
 #elif PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION)
@@ -1564,7 +1564,7 @@ static inline PyObject* PyBytes_Join(PyObject *sep, PyObject *iterable)
 static inline Py_hash_t Py_HashBuffer(const void *ptr, Py_ssize_t len)
 {
 #if PY_VERSION_HEX >= 0x03000000 && !defined(PYPY_VERSION)
-    extern Py_hash_t _Py_HashBytes(const void *src, Py_ssize_t len);
+    PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void *src, Py_ssize_t len);
 
     return _Py_HashBytes(ptr, len);
 #else

Original file line number	Diff line number	Diff line change
`@@ -1537,7 +1537,7 @@ static inline int PyUnicode_Equal(PyObject str1, PyObject str2)`
`1537`	`1537`	`}`
`1538`	`1538`
`1539`	`1539`	`#if PY_VERSION_HEX >= 0x030d0000 && !defined(PYPY_VERSION)`
`1540`		`- extern int _PyUnicode_Equal(PyObject str1, PyObject str2);`
	`1540`	`+ PyAPI_FUNC(int) _PyUnicode_Equal(PyObject str1, PyObject str2);`
`1541`	`1541`
`1542`	`1542`	`return _PyUnicode_Equal(str1, str2);`
`1543`	`1543`	`#elif PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION)`
`@@ -1564,7 +1564,7 @@ static inline PyObject* PyBytes_Join(PyObject sep, PyObject iterable)`
`1564`	`1564`	`static inline Py_hash_t Py_HashBuffer(const void *ptr, Py_ssize_t len)`
`1565`	`1565`	`{`
`1566`	`1566`	`#if PY_VERSION_HEX >= 0x03000000 && !defined(PYPY_VERSION)`
`1567`		`- extern Py_hash_t _Py_HashBytes(const void *src, Py_ssize_t len);`
	`1567`	`+ PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void *src, Py_ssize_t len);`
`1568`	`1568`
`1569`	`1569`	`return _Py_HashBytes(ptr, len);`
`1570`	`1570`	`#else`