bpo-8677: use PY_SSIZE_T_CLEAN in sqlite (GH-12434)

Modules/_sqlite/cursor.c uses "y#" format.
It didn't declare PY_SSIZE_T_CLEAN, but the argument is Py_ssize_t already.

diff --git a/Modules/_sqlite/cache.h b/Modules/_sqlite/cache.h
index a133903961dae8b144942eb407cda67952879335..529010967c4f3a99c8a4a11a2b993f9bdcae8196 100644 (file)
--- a/Modules/_sqlite/cache.h
+++ b/Modules/_sqlite/cache.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_CACHE_H
 #define PYSQLITE_CACHE_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 /* The LRU cache is implemented as a combination of a doubly-linked with a

diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index 5fb410a62e53e92ede8be01ee174a2cb3f38d025..4e9d94c5f3089135affe3173d74750a293b7552d 100644 (file)
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_CONNECTION_H
 #define PYSQLITE_CONNECTION_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pythread.h"
 #include "structmember.h"

diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
index 28bbd5f91175833de1254689b58692d46aed8f0c..4a20e756f7829d9a9a0b210cac9c9f72da5bbc4b 100644 (file)
--- a/Modules/_sqlite/cursor.h
+++ b/Modules/_sqlite/cursor.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_CURSOR_H
 #define PYSQLITE_CURSOR_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include "statement.h"

diff --git a/Modules/_sqlite/microprotocols.h b/Modules/_sqlite/microprotocols.h
index 99ff6f642b25eb338f5c75868f718885ef022c50..5418c2b98fd7519dd235f40d146a2a0069f6281e 100644 (file)
--- a/Modules/_sqlite/microprotocols.h
+++ b/Modules/_sqlite/microprotocols.h
@@ -26,6 +26,7 @@
 #ifndef PSYCOPG_MICROPROTOCOLS_H
 #define PSYCOPG_MICROPROTOCOLS_H 1
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
 /** the names of the three mandatory methods **/

diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h
index 6f90934b325dc097ce8c9c54d121ae3197735cb4..3185ec978885676830e6b251da9604628969b28d 100644 (file)
--- a/Modules/_sqlite/module.h
+++ b/Modules/_sqlite/module.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_MODULE_H
 #define PYSQLITE_MODULE_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #define PYSQLITE_VERSION "2.6.0"

diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h
index 924e16223acf57379e3cb124c3a664df41058317..3998a55e51cafeed4cf947b22e19fba5e82f9bd9 100644 (file)
--- a/Modules/_sqlite/prepare_protocol.h
+++ b/Modules/_sqlite/prepare_protocol.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_PREPARE_PROTOCOL_H
 #define PYSQLITE_PREPARE_PROTOCOL_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 typedef struct

diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
index d014109032ad827e269c76c2238a1d75a97e54ba..4ad506f8dd968731f28d44808fa182f5078545d6 100644 (file)
--- a/Modules/_sqlite/row.h
+++ b/Modules/_sqlite/row.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_ROW_H
 #define PYSQLITE_ROW_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 typedef struct _Row

diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
index fd88d7d6622c7e7025f167231393d257ee2bb612..5002f02dc5b39261ba3c842b0ed2af82091945a7 100644 (file)
--- a/Modules/_sqlite/statement.h
+++ b/Modules/_sqlite/statement.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_STATEMENT_H
 #define PYSQLITE_STATEMENT_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include "connection.h"

diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
index abaefd8b87b8646ce9ff0fae34d8247851e8bd17..626191118f9257c0734c9dfd76c520e38fd4a2ed 100644 (file)
--- a/Modules/_sqlite/util.h
+++ b/Modules/_sqlite/util.h
@@ -23,6 +23,7 @@
 
 #ifndef PYSQLITE_UTIL_H
 #define PYSQLITE_UTIL_H
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pythread.h"
 #include "sqlite3.h"