https://github.com/python/cpython/commit/dc2d0f46540159aa22774777791105140e4d74c1
commit: dc2d0f46540159aa22774777791105140e4d74c1
branch: main
author: Victor Stinner <vstin...@python.org>
committer: vstinner <vstin...@python.org>
date: 2024-03-18T23:06:52+01:00
summary:
gh-116417: Fix WASI build of _testlimitedcapi (#116974)
Use different function names between _testcapi and _testlimitedcapi
to not confuse the WASI linker.
files:
M Modules/_testlimitedcapi.c
M Modules/_testlimitedcapi/bytearray.c
M Modules/_testlimitedcapi/bytes.c
M Modules/_testlimitedcapi/heaptype_relative.c
M Modules/_testlimitedcapi/list.c
M Modules/_testlimitedcapi/parts.h
M Modules/_testlimitedcapi/pyos.c
M Modules/_testlimitedcapi/set.c
M Modules/_testlimitedcapi/sys.c
M Modules/_testlimitedcapi/vectorcall_limited.c
diff --git a/Modules/_testlimitedcapi.c b/Modules/_testlimitedcapi.c
index a25b0aa2de7c99..9edc4fe3a9e970 100644
--- a/Modules/_testlimitedcapi.c
+++ b/Modules/_testlimitedcapi.c
@@ -26,28 +26,28 @@ PyInit__testlimitedcapi(void)
return NULL;
}
- if (_PyTestCapi_Init_ByteArray(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_ByteArray(mod) < 0) {
return NULL;
}
- if (_PyTestCapi_Init_Bytes(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_Bytes(mod) < 0) {
return NULL;
}
- if (_PyTestCapi_Init_HeaptypeRelative(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_HeaptypeRelative(mod) < 0) {
return NULL;
}
- if (_PyTestCapi_Init_List(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_List(mod) < 0) {
return NULL;
}
- if (_PyTestCapi_Init_PyOS(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_PyOS(mod) < 0) {
return NULL;
}
- if (_PyTestCapi_Init_Set(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_Set(mod) < 0) {
return NULL;
}
- if (_PyTestCapi_Init_Sys(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_Sys(mod) < 0) {
return NULL;
}
- if (_PyTestCapi_Init_VectorcallLimited(mod) < 0) {
+ if (_PyTestLimitedCAPI_Init_VectorcallLimited(mod) < 0) {
return NULL;
}
return mod;
diff --git a/Modules/_testlimitedcapi/bytearray.c
b/Modules/_testlimitedcapi/bytearray.c
index dc47ed2c306f40..68b029e25af677 100644
--- a/Modules/_testlimitedcapi/bytearray.c
+++ b/Modules/_testlimitedcapi/bytearray.c
@@ -113,7 +113,7 @@ static PyMethodDef test_methods[] = {
};
int
-_PyTestCapi_Init_ByteArray(PyObject *m)
+_PyTestLimitedCAPI_Init_ByteArray(PyObject *m)
{
if (PyModule_AddFunctions(m, test_methods) < 0) {
return -1;
diff --git a/Modules/_testlimitedcapi/bytes.c b/Modules/_testlimitedcapi/bytes.c
index a14c4f9d4d30a8..157d4089954af5 100644
--- a/Modules/_testlimitedcapi/bytes.c
+++ b/Modules/_testlimitedcapi/bytes.c
@@ -245,7 +245,7 @@ static PyMethodDef test_methods[] = {
};
int
-_PyTestCapi_Init_Bytes(PyObject *m)
+_PyTestLimitedCAPI_Init_Bytes(PyObject *m)
{
if (PyModule_AddFunctions(m, test_methods) < 0) {
return -1;
diff --git a/Modules/_testlimitedcapi/heaptype_relative.c
b/Modules/_testlimitedcapi/heaptype_relative.c
index d0316dd4fc63b4..7c508c6182bc8a 100644
--- a/Modules/_testlimitedcapi/heaptype_relative.c
+++ b/Modules/_testlimitedcapi/heaptype_relative.c
@@ -331,7 +331,8 @@ static PyMethodDef TestMethods[] = {
};
int
-_PyTestCapi_Init_HeaptypeRelative(PyObject *m) {
+_PyTestLimitedCAPI_Init_HeaptypeRelative(PyObject *m)
+{
if (PyModule_AddFunctions(m, TestMethods) < 0) {
return -1;
}
diff --git a/Modules/_testlimitedcapi/list.c b/Modules/_testlimitedcapi/list.c
index 0917900da390ce..3022cbf9191b2e 100644
--- a/Modules/_testlimitedcapi/list.c
+++ b/Modules/_testlimitedcapi/list.c
@@ -159,7 +159,7 @@ static PyMethodDef test_methods[] = {
};
int
-_PyTestCapi_Init_List(PyObject *m)
+_PyTestLimitedCAPI_Init_List(PyObject *m)
{
if (PyModule_AddFunctions(m, test_methods) < 0) {
return -1;
diff --git a/Modules/_testlimitedcapi/parts.h b/Modules/_testlimitedcapi/parts.h
index bb867eccbfe5c3..ee67f10e4b4830 100644
--- a/Modules/_testlimitedcapi/parts.h
+++ b/Modules/_testlimitedcapi/parts.h
@@ -22,13 +22,13 @@
# error "Py_BUILD_CORE macro must not be defined"
#endif
-int _PyTestCapi_Init_ByteArray(PyObject *module);
-int _PyTestCapi_Init_Bytes(PyObject *module);
-int _PyTestCapi_Init_HeaptypeRelative(PyObject *module);
-int _PyTestCapi_Init_List(PyObject *module);
-int _PyTestCapi_Init_PyOS(PyObject *module);
-int _PyTestCapi_Init_Set(PyObject *module);
-int _PyTestCapi_Init_Sys(PyObject *module);
-int _PyTestCapi_Init_VectorcallLimited(PyObject *module);
+int _PyTestLimitedCAPI_Init_ByteArray(PyObject *module);
+int _PyTestLimitedCAPI_Init_Bytes(PyObject *module);
+int _PyTestLimitedCAPI_Init_HeaptypeRelative(PyObject *module);
+int _PyTestLimitedCAPI_Init_List(PyObject *module);
+int _PyTestLimitedCAPI_Init_PyOS(PyObject *module);
+int _PyTestLimitedCAPI_Init_Set(PyObject *module);
+int _PyTestLimitedCAPI_Init_Sys(PyObject *module);
+int _PyTestLimitedCAPI_Init_VectorcallLimited(PyObject *module);
#endif // Py_TESTLIMITEDCAPI_PARTS_H
diff --git a/Modules/_testlimitedcapi/pyos.c b/Modules/_testlimitedcapi/pyos.c
index 63140e914875db..0f61801eae322a 100644
--- a/Modules/_testlimitedcapi/pyos.c
+++ b/Modules/_testlimitedcapi/pyos.c
@@ -50,7 +50,7 @@ static PyMethodDef test_methods[] = {
};
int
-_PyTestCapi_Init_PyOS(PyObject *mod)
+_PyTestLimitedCAPI_Init_PyOS(PyObject *mod)
{
if (PyModule_AddFunctions(mod, test_methods) < 0) {
return -1;
diff --git a/Modules/_testlimitedcapi/set.c b/Modules/_testlimitedcapi/set.c
index 471b515f874473..35da5fa5f008e1 100644
--- a/Modules/_testlimitedcapi/set.c
+++ b/Modules/_testlimitedcapi/set.c
@@ -179,7 +179,7 @@ static PyMethodDef test_methods[] = {
};
int
-_PyTestCapi_Init_Set(PyObject *m)
+_PyTestLimitedCAPI_Init_Set(PyObject *m)
{
if (PyModule_AddFunctions(m, test_methods) < 0) {
return -1;
diff --git a/Modules/_testlimitedcapi/sys.c b/Modules/_testlimitedcapi/sys.c
index aa40e3cd5b9b29..7d8b7a8569e515 100644
--- a/Modules/_testlimitedcapi/sys.c
+++ b/Modules/_testlimitedcapi/sys.c
@@ -46,7 +46,7 @@ static PyMethodDef test_methods[] = {
};
int
-_PyTestCapi_Init_Sys(PyObject *m)
+_PyTestLimitedCAPI_Init_Sys(PyObject *m)
{
if (PyModule_AddFunctions(m, test_methods) < 0) {
return -1;
diff --git a/Modules/_testlimitedcapi/vectorcall_limited.c
b/Modules/_testlimitedcapi/vectorcall_limited.c
index fc1a89c9098e1b..784126c17fccc1 100644
--- a/Modules/_testlimitedcapi/vectorcall_limited.c
+++ b/Modules/_testlimitedcapi/vectorcall_limited.c
@@ -182,7 +182,8 @@ static PyMethodDef TestMethods[] = {
};
int
-_PyTestCapi_Init_VectorcallLimited(PyObject *m) {
+_PyTestLimitedCAPI_Init_VectorcallLimited(PyObject *m)
+{
if (PyModule_AddFunctions(m, TestMethods) < 0) {
return -1;
}
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
