Only include Python.h in module.h

Erlend E. Aasland · Erlend E. Aasland · commit 841a72aceea9 · 2022-02-15T10:45:20.000+01:00
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
@@ -23,13 +23,12 @@
 
 #ifndef PYSQLITE_CONNECTION_H
 #define PYSQLITE_CONNECTION_H
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
-#include "pythread.h"
-#include "structmember.h"
 
 #include "module.h"
 
+#include "pythread.h"
+#include "structmember.h"
+
 #include "sqlite3.h"
 
 typedef struct _callback_context
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -22,7 +22,6 @@
  */
 
 #include "cursor.h"
-#include "module.h"
 #include "util.h"
 
 #define clinic_state() (pysqlite_get_state_by_type(Py_TYPE(self)))
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
@@ -23,12 +23,10 @@
 
 #ifndef PYSQLITE_CURSOR_H
 #define PYSQLITE_CURSOR_H
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
 
+#include "module.h"
 #include "statement.h"
 #include "connection.h"
-#include "module.h"
 
 typedef struct
 {
diff --git a/Modules/_sqlite/microprotocols.c b/Modules/_sqlite/microprotocols.c
@@ -23,10 +23,8 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <Python.h>
-
-#include "cursor.h"
 #include "microprotocols.h"
+#include "cursor.h"
 #include "prepare_protocol.h"
 
 
diff --git a/Modules/_sqlite/microprotocols.h b/Modules/_sqlite/microprotocols.h
@@ -26,8 +26,7 @@
 #ifndef PSYCOPG_MICROPROTOCOLS_H
 #define PSYCOPG_MICROPROTOCOLS_H 1
 
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
+#include "module.h"
 
 /** exported functions **/
 
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
@@ -21,6 +21,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
+#include "module.h"
 #include "connection.h"
 #include "statement.h"
 #include "cursor.h"
diff --git 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
+
 #include "module.h"
 
 typedef struct
diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
@@ -23,8 +23,8 @@
 
 #ifndef PYSQLITE_ROW_H
 #define PYSQLITE_ROW_H
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
+
+#include "module.h"
 
 typedef struct _Row
 {
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
@@ -23,9 +23,8 @@
 
 #ifndef PYSQLITE_STATEMENT_H
 #define PYSQLITE_STATEMENT_H
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
 
+#include "module.h"
 #include "connection.h"
 #include "sqlite3.h"
 
diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c
@@ -21,7 +21,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include "module.h"
+#include "util.h"
 #include "connection.h"
 
 int
diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
@@ -23,8 +23,8 @@
 
 #ifndef PYSQLITE_UTIL_H
 #define PYSQLITE_UTIL_H
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
+
+#include "module.h"
 #include "pythread.h"
 #include "sqlite3.h"
 #include "connection.h"

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`
`24`	`24`	`#ifndef PYSQLITE_ROW_H`
`25`	`25`	`#define PYSQLITE_ROW_H`
`26`		`-#define PY_SSIZE_T_CLEAN`
`27`		`-#include "Python.h"`
	`26`	`+`
	`27`	`+#include "module.h"`
`28`	`28`
`29`	`29`	`typedef struct _Row`
`30`	`30`	`{`