python · erlend-aasland · Sep 26, 2020 · Sep 26, 2020 · Sep 26, 2020 · Oct 5, 2020
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -23,13 +23,14 @@

 #include "cache.h"
 #include "module.h"
-#include "structmember.h"         // PyMemberDef
 #include "connection.h"
 #include "statement.h"
 #include "cursor.h"
 #include "prepare_protocol.h"
 #include "util.h"

+#include "structmember.h"         // PyMemberDef
+
 #define ACTION_FINALIZE 1
 #define ACTION_RESET 2


diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
@@ -25,8 +25,6 @@
 #define PYSQLITE_CONNECTION_H
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "pythread.h"
-#include "structmember.h"

 #include "cache.h"
 #include "module.h"

diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -25,6 +25,8 @@
 #include "module.h"
 #include "util.h"

+#include "structmember.h"         // PyMemberDef
+
 PyObject* pysqlite_cursor_iternext(pysqlite_Cursor* self);

 static const char errmsg_fetch_across_rollback[] = "Cursor needed to be reset because of commit/rollback and can no longer be fetched from.";

diff --git a/Modules/_sqlite/microprotocols.c b/Modules/_sqlite/microprotocols.c
@@ -23,8 +23,6 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */

-#include <Python.h>
-
 #include "cursor.h"
 #include "microprotocols.h"
 #include "prepare_protocol.h"

diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
@@ -28,6 +28,8 @@
 #include "prepare_protocol.h"
 #include "util.h"

+#include "structmember.h"         // PyMemberDef
+
 /* prototypes */
 static int pysqlite_check_remaining_sql(const char* tail);

@@ -461,7 +463,7 @@ static int pysqlite_check_remaining_sql(const char* tail)
    return 0;
 }

-static PyMemberDef stmt_members[] = {
+static struct PyMemberDef stmt_members[] = {
    {"__weaklistoffset__", T_PYSSIZET, offsetof(pysqlite_Statement, in_weakreflist), READONLY},
    {NULL},
 };

diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
@@ -25,7 +25,7 @@
 #define PYSQLITE_UTIL_H
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "pythread.h"
+
 #include "sqlite3.h"
 #include "connection.h"