From 0b38d385e2382924b1909e5dcc6eb3c4e0f4f3b3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 14 Jun 2021 08:47:08 +0530 Subject: [PATCH] Dont use designated initializers --- setup/extensions.json | 3 +-- src/calibre/db/sqlite_extension.cpp | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/setup/extensions.json b/setup/extensions.json index d77222454f..c9e5305227 100644 --- a/setup/extensions.json +++ b/setup/extensions.json @@ -74,8 +74,7 @@ { "name": "sqlite_extension", "sources": "calibre/db/sqlite_extension.cpp", - "inc_dirs": "!sqlite_inc_dirs", - "needs_c++14": true + "inc_dirs": "!sqlite_inc_dirs" }, { "name": "lzx", diff --git a/src/calibre/db/sqlite_extension.cpp b/src/calibre/db/sqlite_extension.cpp index f45749e8e0..7277f08e13 100644 --- a/src/calibre/db/sqlite_extension.cpp +++ b/src/calibre/db/sqlite_extension.cpp @@ -62,15 +62,14 @@ exec_module(PyObject *mod) { return 0; } static PyModuleDef_Slot slots[] = { {Py_mod_exec, (void*)exec_module}, {0, NULL} }; -static struct PyModuleDef module_def = { - .m_base = PyModuleDef_HEAD_INIT, - .m_name = "sqlite_extension", - .m_doc = "Implement ICU based tokenizer for FTS5", - .m_methods = methods, - .m_slots = slots, -}; - +static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT}; extern "C" { -CALIBRE_MODINIT_FUNC PyInit_sqlite_extension(void) { return PyModuleDef_Init(&module_def); } +CALIBRE_MODINIT_FUNC PyInit_sqlite_extension(void) { + module_def.m_name = "sqlite_extension"; + module_def.m_doc = "Implement ICU based tokenizer for FTS5"; + module_def.m_methods = methods; + module_def.m_slots = slots; + return PyModuleDef_Init(&module_def); +} }