Skip to content

Commit 6ccb17c

Browse files
committed
Fix PyInit_ symbol naming for wasm
1 parent da470c0 commit 6ccb17c

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

src_c/base.c

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2422,7 +2422,7 @@ PyMODINIT_FUNC
24222422
PyInit_mixer_music(void);
24232423

24242424
PyMODINIT_FUNC
2425-
PyInit_mixer(void);
2425+
PyInit_pg_mixer(void);
24262426

24272427
PyMODINIT_FUNC
24282428
PyInit_pg_math(void);
@@ -2464,16 +2464,13 @@ PyMODINIT_FUNC
24642464
PyInit_sdl2(void);
24652465

24662466
PyMODINIT_FUNC
2467-
PyInit_sdl2_controller(void);
2468-
2469-
PyMODINIT_FUNC
2470-
PyInit_sdl2_mixer(void);
2467+
PyInit_mixer(void);
24712468

24722469
PyMODINIT_FUNC
2473-
PyInit_sdl2_audio(void);
2470+
PyInit_audio(void);
24742471

24752472
PyMODINIT_FUNC
2476-
PyInit_sdl2_video(void);
2473+
PyInit_video(void);
24772474

24782475
#endif
24792476

@@ -2552,10 +2549,9 @@ mod_pygame_import_cython(PyObject *self, PyObject *spec)
25522549
#pragma message "WARNING: pygame._sdl2.* are disabled"
25532550
#else
25542551
load_submodule_mphase("pygame._sdl2", PyInit_sdl2(), spec, "sdl2");
2555-
load_submodule_mphase("pygame._sdl2", PyInit_sdl2_mixer(), spec, "mixer");
2556-
load_submodule("pygame._sdl2", PyInit_sdl2_controller(), "controller");
2557-
load_submodule_mphase("pygame._sdl2", PyInit_sdl2_audio(), spec, "audio");
2558-
load_submodule_mphase("pygame._sdl2", PyInit_sdl2_video(), spec, "video");
2552+
load_submodule_mphase("pygame._sdl2", PyInit_mixer(), spec, "mixer");
2553+
load_submodule_mphase("pygame._sdl2", PyInit_audio(), spec, "audio");
2554+
load_submodule_mphase("pygame._sdl2", PyInit_video(), spec, "video");
25592555
#endif
25602556

25612557
Py_RETURN_NONE;
@@ -2621,7 +2617,7 @@ PyInit_pygame_static()
26212617
load_submodule("pygame", PyInit_mask(), "mask");
26222618
load_submodule("pygame", PyInit_mouse(), "mouse");
26232619

2624-
load_submodule("pygame", PyInit_mixer(), "mixer");
2620+
load_submodule("pygame", PyInit_pg_mixer(), "mixer");
26252621
load_submodule("pygame.mixer", PyInit_mixer_music(), "music");
26262622

26272623
// base, color, rect, bufferproxy, surflock, surface

src_c/mixer.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,12 @@ pgChannel_New(int channelnum)
20492049
return (PyObject *)chanobj;
20502050
}
20512051

2052+
#if defined(BUILD_STATIC)
2053+
// prevent name collision with _sdl2.mixer
2054+
MODINIT_DEFINE(pg_mixer)
2055+
#else
20522056
MODINIT_DEFINE(mixer)
2057+
#endif
20532058
{
20542059
PyObject *module, *apiobj, *music = NULL;
20552060
static void *c_api[PYGAMEAPI_MIXER_NUMSLOTS];

0 commit comments

Comments
 (0)