Skip to content

Commit e56234d

Browse files
vstinneradorilson
authored andcommitted
pythongh-116417: Fix WASI build of _testlimitedcapi (python#116974)
Use different function names between _testcapi and _testlimitedcapi to not confuse the WASI linker.
1 parent d2cc307 commit e56234d

File tree

10 files changed

+26
-24
lines changed

10 files changed

+26
-24
lines changed

Modules/_testlimitedcapi.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ PyInit__testlimitedcapi(void)
2626
return NULL;
2727
}
2828

29-
if (_PyTestCapi_Init_ByteArray(mod) < 0) {
29+
if (_PyTestLimitedCAPI_Init_ByteArray(mod) < 0) {
3030
return NULL;
3131
}
32-
if (_PyTestCapi_Init_Bytes(mod) < 0) {
32+
if (_PyTestLimitedCAPI_Init_Bytes(mod) < 0) {
3333
return NULL;
3434
}
35-
if (_PyTestCapi_Init_HeaptypeRelative(mod) < 0) {
35+
if (_PyTestLimitedCAPI_Init_HeaptypeRelative(mod) < 0) {
3636
return NULL;
3737
}
38-
if (_PyTestCapi_Init_List(mod) < 0) {
38+
if (_PyTestLimitedCAPI_Init_List(mod) < 0) {
3939
return NULL;
4040
}
41-
if (_PyTestCapi_Init_PyOS(mod) < 0) {
41+
if (_PyTestLimitedCAPI_Init_PyOS(mod) < 0) {
4242
return NULL;
4343
}
44-
if (_PyTestCapi_Init_Set(mod) < 0) {
44+
if (_PyTestLimitedCAPI_Init_Set(mod) < 0) {
4545
return NULL;
4646
}
47-
if (_PyTestCapi_Init_Sys(mod) < 0) {
47+
if (_PyTestLimitedCAPI_Init_Sys(mod) < 0) {
4848
return NULL;
4949
}
50-
if (_PyTestCapi_Init_VectorcallLimited(mod) < 0) {
50+
if (_PyTestLimitedCAPI_Init_VectorcallLimited(mod) < 0) {
5151
return NULL;
5252
}
5353
return mod;

Modules/_testlimitedcapi/bytearray.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static PyMethodDef test_methods[] = {
113113
};
114114

115115
int
116-
_PyTestCapi_Init_ByteArray(PyObject *m)
116+
_PyTestLimitedCAPI_Init_ByteArray(PyObject *m)
117117
{
118118
if (PyModule_AddFunctions(m, test_methods) < 0) {
119119
return -1;

Modules/_testlimitedcapi/bytes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static PyMethodDef test_methods[] = {
245245
};
246246

247247
int
248-
_PyTestCapi_Init_Bytes(PyObject *m)
248+
_PyTestLimitedCAPI_Init_Bytes(PyObject *m)
249249
{
250250
if (PyModule_AddFunctions(m, test_methods) < 0) {
251251
return -1;

Modules/_testlimitedcapi/heaptype_relative.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,8 @@ static PyMethodDef TestMethods[] = {
331331
};
332332

333333
int
334-
_PyTestCapi_Init_HeaptypeRelative(PyObject *m) {
334+
_PyTestLimitedCAPI_Init_HeaptypeRelative(PyObject *m)
335+
{
335336
if (PyModule_AddFunctions(m, TestMethods) < 0) {
336337
return -1;
337338
}

Modules/_testlimitedcapi/list.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static PyMethodDef test_methods[] = {
159159
};
160160

161161
int
162-
_PyTestCapi_Init_List(PyObject *m)
162+
_PyTestLimitedCAPI_Init_List(PyObject *m)
163163
{
164164
if (PyModule_AddFunctions(m, test_methods) < 0) {
165165
return -1;

Modules/_testlimitedcapi/parts.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
# error "Py_BUILD_CORE macro must not be defined"
2323
#endif
2424

25-
int _PyTestCapi_Init_ByteArray(PyObject *module);
26-
int _PyTestCapi_Init_Bytes(PyObject *module);
27-
int _PyTestCapi_Init_HeaptypeRelative(PyObject *module);
28-
int _PyTestCapi_Init_List(PyObject *module);
29-
int _PyTestCapi_Init_PyOS(PyObject *module);
30-
int _PyTestCapi_Init_Set(PyObject *module);
31-
int _PyTestCapi_Init_Sys(PyObject *module);
32-
int _PyTestCapi_Init_VectorcallLimited(PyObject *module);
25+
int _PyTestLimitedCAPI_Init_ByteArray(PyObject *module);
26+
int _PyTestLimitedCAPI_Init_Bytes(PyObject *module);
27+
int _PyTestLimitedCAPI_Init_HeaptypeRelative(PyObject *module);
28+
int _PyTestLimitedCAPI_Init_List(PyObject *module);
29+
int _PyTestLimitedCAPI_Init_PyOS(PyObject *module);
30+
int _PyTestLimitedCAPI_Init_Set(PyObject *module);
31+
int _PyTestLimitedCAPI_Init_Sys(PyObject *module);
32+
int _PyTestLimitedCAPI_Init_VectorcallLimited(PyObject *module);
3333

3434
#endif // Py_TESTLIMITEDCAPI_PARTS_H

Modules/_testlimitedcapi/pyos.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static PyMethodDef test_methods[] = {
5050
};
5151

5252
int
53-
_PyTestCapi_Init_PyOS(PyObject *mod)
53+
_PyTestLimitedCAPI_Init_PyOS(PyObject *mod)
5454
{
5555
if (PyModule_AddFunctions(mod, test_methods) < 0) {
5656
return -1;

Modules/_testlimitedcapi/set.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static PyMethodDef test_methods[] = {
179179
};
180180

181181
int
182-
_PyTestCapi_Init_Set(PyObject *m)
182+
_PyTestLimitedCAPI_Init_Set(PyObject *m)
183183
{
184184
if (PyModule_AddFunctions(m, test_methods) < 0) {
185185
return -1;

Modules/_testlimitedcapi/sys.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static PyMethodDef test_methods[] = {
4646
};
4747

4848
int
49-
_PyTestCapi_Init_Sys(PyObject *m)
49+
_PyTestLimitedCAPI_Init_Sys(PyObject *m)
5050
{
5151
if (PyModule_AddFunctions(m, test_methods) < 0) {
5252
return -1;

Modules/_testlimitedcapi/vectorcall_limited.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ static PyMethodDef TestMethods[] = {
182182
};
183183

184184
int
185-
_PyTestCapi_Init_VectorcallLimited(PyObject *m) {
185+
_PyTestLimitedCAPI_Init_VectorcallLimited(PyObject *m)
186+
{
186187
if (PyModule_AddFunctions(m, TestMethods) < 0) {
187188
return -1;
188189
}

0 commit comments

Comments
 (0)