Skip to content

gh-103092: Isolate winsound #103249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 5 commits into from
Apr 10, 2023
Merged

gh-103092: Isolate winsound #103249

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8d424c
gh-103092: isolate winsound
aisk Apr 4, 2023
0a7e6f8
Update PC/winsound.c
aisk Apr 6, 2023
4608cd7
Update Misc/NEWS.d/next/Library/2023-04-04-21-27-51.gh-issue-103092.7…
aisk Apr 9, 2023
d16e2cd
Update PC/winsound.c
aisk Apr 9, 2023
f1a5c41
Merge branch 'main' into isolate-winsound
erlend-aasland Apr 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'main' into isolate-winsound
  • Loading branch information
@erlend-aasland
erlend-aasland authored Apr 9, 2023
commit f1a5c41bdc6964e296dc392c986a3b15e524aff5
10 changes: 3 additions & 7 deletions PC/winsound.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,19 +204,13 @@ static struct PyMethodDef sound_methods[] =

#define ADD_DEFINE(CONST) do { \
if (PyModule_AddIntConstant(module, #CONST, CONST) < 0) { \
goto error; \
return -1; \
} \
} while (0)

static int
exec_module(PyObject *module)
{
PyObject *dict;
dict = PyModule_GetDict(module);
if (dict == NULL) {
return -1;
}

ADD_DEFINE(SND_ASYNC);
ADD_DEFINE(SND_NODEFAULT);
ADD_DEFINE(SND_NOSTOP);
Expand All @@ -234,6 +228,8 @@ exec_module(PyObject *module)
ADD_DEFINE(MB_ICONHAND);
ADD_DEFINE(MB_ICONQUESTION);

#undef ADD_DEFINE

return 0;
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.