move cast macros to .c files

python · encukou · Jan 31, 2025 · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025
commit 63afc083298428ce725679071f28ba01d091aa7b
@@ -9,6 +9,8 @@
 #include "clinic/blob.c.h"
 #undef clinic_state
 
+#define _pysqlite_Blob_CAST(op) ((pysqlite_Blob *)(op))
+
 /*[clinic input]
 module _sqlite3
 class _sqlite3.Blob "pysqlite_Blob *" "clinic_state()->BlobType"

diff --git a/Modules/_sqlite/blob.h b/Modules/_sqlite/blob.h
@@ -18,8 +18,6 @@ typedef struct {
     PyObject *in_weakreflist;
 } pysqlite_Blob;
 
-#define _pysqlite_Blob_CAST(op) ((pysqlite_Blob *)(op))
-
 int pysqlite_blob_setup_types(PyObject *mod);
 void pysqlite_close_all_blobs(pysqlite_Connection *self);
 

@@ -136,6 +136,8 @@ sqlite3_int64_converter(PyObject *obj, sqlite3_int64 *result)
 #include "clinic/connection.c.h"
 #undef clinic_state
 
+#define _pysqlite_Connection_CAST(op)   ((pysqlite_Connection *)(op))
+
 /*[clinic input]
 module _sqlite3
 class _sqlite3.Connection "pysqlite_Connection *" "clinic_state()->ConnectionType"

diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
@@ -105,8 +105,6 @@ typedef struct
     PyObject* NotSupportedError;
 } pysqlite_Connection;
 
-#define _pysqlite_Connection_CAST(op)   ((pysqlite_Connection *)(op))
-
 int pysqlite_check_thread(pysqlite_Connection* self);
 int pysqlite_check_connection(pysqlite_Connection* con);
 

@@ -44,6 +44,8 @@ typedef enum {
 #include "clinic/cursor.c.h"
 #undef clinic_state
 
+#define _pysqlite_Cursor_CAST(op)   ((pysqlite_Cursor *)(op))
+
 static inline int
 check_cursor_locked(pysqlite_Cursor *cur)
 {

diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
@@ -47,8 +47,6 @@ typedef struct
     PyObject* in_weakreflist; /* List of weak references */
 } pysqlite_Cursor;
 
-#define _pysqlite_Cursor_CAST(op)   ((pysqlite_Cursor *)(op))
-
 int pysqlite_cursor_setup_types(PyObject *module);
 
 #endif
diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h
@@ -30,8 +30,6 @@ typedef struct
     PyObject_HEAD
 } pysqlite_PrepareProtocol;
 
-#define _pysqlite_PrepareProtocol_CAST(op)  ((pysqlite_PrepareProtocol *)(op))
-
 int pysqlite_prepare_protocol_setup_types(PyObject *module);
 
 #endif
@@ -32,6 +32,8 @@
 #include "clinic/row.c.h"
 #undef clinic_state
 
+#define _pysqlite_Row_CAST(op)  ((pysqlite_Row *)(op))
+
 /*[clinic input]
 module _sqlite3
 class _sqlite3.Row "pysqlite_Row *" "clinic_state()->RowType"

diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
@@ -32,8 +32,6 @@ typedef struct _Row
     PyObject* description;
 } pysqlite_Row;
 
-#define _pysqlite_Row_CAST(op)  ((pysqlite_Row *)(op))
-
 int pysqlite_row_setup_types(PyObject *module);
 
 #endif
@@ -25,6 +25,8 @@
 #include "statement.h"
 #include "util.h"
 
+#define _pysqlite_Statement_CAST(op)    ((pysqlite_Statement *)(op))
+
 /* prototypes */
 static const char *lstrip_sql(const char *sql);
 

diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
@@ -35,8 +35,6 @@ typedef struct
     int is_dml;
 } pysqlite_Statement;
 
-#define _pysqlite_Statement_CAST(op)    ((pysqlite_Statement *)(op))
-
 pysqlite_Statement *pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql);
 
 int pysqlite_statement_setup_types(PyObject *module);