From 7516a8bda98513d8e4ef4b15abce24608c62acff Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Oct 2020 19:48:36 +0530 Subject: [PATCH] See if we can at least statically initialize some of module_def --- src/calibre/utils/fonts/freetype.cpp | 3 +-- src/calibre/utils/spell/hunspell_wrapper.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/utils/fonts/freetype.cpp b/src/calibre/utils/fonts/freetype.cpp index 62314bfe2e..6e545f4ce5 100644 --- a/src/calibre/utils/fonts/freetype.cpp +++ b/src/calibre/utils/fonts/freetype.cpp @@ -309,10 +309,9 @@ exec_module(PyObject *m) { static PyModuleDef_Slot slots[] = { {Py_mod_exec, (void*)exec_module}, {0, NULL} }; -static struct PyModuleDef module_def = {{0}}; +static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT}; CALIBRE_MODINIT_FUNC PyInit_freetype(void) { - module_def.m_base = PyModuleDef_HEAD_INIT; module_def.m_name = "freetype"; module_def.m_doc = freetype_doc; module_def.m_slots = slots; diff --git a/src/calibre/utils/spell/hunspell_wrapper.cpp b/src/calibre/utils/spell/hunspell_wrapper.cpp index 7e48dbe2be..371c65e963 100644 --- a/src/calibre/utils/spell/hunspell_wrapper.cpp +++ b/src/calibre/utils/spell/hunspell_wrapper.cpp @@ -184,10 +184,9 @@ exec_module(PyObject *mod) { static PyModuleDef_Slot slots[] = { {Py_mod_exec, (void*)exec_module}, {0, NULL} }; -static struct PyModuleDef module_def = {{0}}; +static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT}; CALIBRE_MODINIT_FUNC PyInit_hunspell(void) { - module_def.m_base = PyModuleDef_HEAD_INIT; module_def.m_name = "hunspell"; module_def.m_slots = slots; return PyModuleDef_Init(&module_def);