From 9b02d4e13289aed99d6048cd03654ad7d72c7f5d Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 26 Sep 2020 21:12:09 +0200 Subject: [PATCH 1/7] Don't include pythread.h --- Modules/_sqlite/connection.h | 1 - Modules/_sqlite/util.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h index aadf439034fe28..34f351ab785fb0 100644 --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -25,7 +25,6 @@ #define PYSQLITE_CONNECTION_H #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "pythread.h" #include "structmember.h" #include "cache.h" diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h index c5a220e9b0aa72..7b9618c7d6e366 100644 --- 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" From d093796c29fe7d437fc21afcdc1f9b30a5e85816 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 26 Sep 2020 22:09:47 +0200 Subject: [PATCH 2/7] Don't include structmember.h twice --- Modules/_sqlite/connection.c | 1 - Modules/_sqlite/connection.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 69203f85e05553..9d643c31a1e051 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -23,7 +23,6 @@ #include "cache.h" #include "module.h" -#include "structmember.h" // PyMemberDef #include "connection.h" #include "statement.h" #include "cursor.h" diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h index 34f351ab785fb0..c6ed6b111e86cf 100644 --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -25,7 +25,7 @@ #define PYSQLITE_CONNECTION_H #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "structmember.h" +#include "structmember.h" // PyMemberDef #include "cache.h" #include "module.h" From 626af398de36723d29d8d27e8f9c4d736c975030 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 26 Sep 2020 22:16:50 +0200 Subject: [PATCH 3/7] Remove superfluous Python.h include --- Modules/_sqlite/microprotocols.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/Modules/_sqlite/microprotocols.c b/Modules/_sqlite/microprotocols.c index 64095adb4db2b2..8498f8ac22098a 100644 --- 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 - #include "cursor.h" #include "microprotocols.h" #include "prepare_protocol.h" From 6be86c9882a33f27ac25d50880edf6035ab230b1 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 5 Oct 2020 12:44:36 +0200 Subject: [PATCH 4/7] Include structmember.h in the .c file, where it's used As per review comments. --- Modules/_sqlite/connection.c | 1 + Modules/_sqlite/connection.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 9d643c31a1e051..69203f85e05553 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -23,6 +23,7 @@ #include "cache.h" #include "module.h" +#include "structmember.h" // PyMemberDef #include "connection.h" #include "statement.h" #include "cursor.h" diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h index c6ed6b111e86cf..55e8849c6f942d 100644 --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -25,7 +25,6 @@ #define PYSQLITE_CONNECTION_H #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "structmember.h" // PyMemberDef #include "cache.h" #include "module.h" From f184612542abe9a1d03a4731a30059c7ac16e517 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 5 Oct 2020 13:12:29 +0200 Subject: [PATCH 5/7] Explicitly include structmember.h in cursor.c --- Modules/_sqlite/cursor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 3c09c1c6b7e50c..4d6d7f6f0357ca 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -21,6 +21,8 @@ * 3. This notice may not be removed or altered from any source distribution. */ +#include "structmember.h" // PyMemberDef + #include "cursor.h" #include "module.h" #include "util.h" From 926e2386edb3482e0879a9489ef1425d8692e9a0 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 5 Oct 2020 13:23:22 +0200 Subject: [PATCH 6/7] Include structmember.h after Python.h --- Modules/_sqlite/connection.c | 3 ++- Modules/_sqlite/cursor.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 69203f85e05553..6ead1433c428c0 100644 --- 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/cursor.c b/Modules/_sqlite/cursor.c index 4d6d7f6f0357ca..9ca03482f51813 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -21,12 +21,12 @@ * 3. This notice may not be removed or altered from any source distribution. */ -#include "structmember.h" // PyMemberDef - #include "cursor.h" #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."; From b98761c865a729849e13dbd134d0b4380ce0af94 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 5 Oct 2020 13:25:37 +0200 Subject: [PATCH 7/7] Fix PyMemberDef in statement.c - Fix incomplete type (PyMemberDef => struct PyMemberDef) - Include structmember.h bco. PyMemberDef --- Modules/_sqlite/statement.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c index 4682d286c581c2..57c47908e48d65 100644 --- 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}, };