Move cast macros to .c

Author: picnixz

Modules/cjkcodecs/multibytecodec.c

@@ -56,6 +56,27 @@ class _multibytecodec.MultibyteStreamWriter "MultibyteStreamWriterObject *" "cli
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=305a76dfdd24b99c]*/
 #undef clinic_get_state
 
+#define _MultibyteCodec_CAST(op)        ((MultibyteCodec *)(op))
+#define _MultibyteCodecObject_CAST(op)  ((MultibyteCodecObject *)(op))
+
+#define _MultibyteStatefulCodecContext_CAST(op) \
+    ((MultibyteStatefulCodecContext *)(op))
+
+#define _MultibyteStatefulEncoderContext_CAST(op)   \
+    ((MultibyteStatefulEncoderContext *)(op))
+#define _MultibyteStatefulDecoderContext_CAST(op)   \
+    ((MultibyteStatefulDecoderContext *)(op))
+
+#define _MultibyteIncrementalEncoderObject_CAST(op) \
+    ((MultibyteIncrementalEncoderObject *)(op))
+#define _MultibyteIncrementalDecoderObject_CAST(op) \
+    ((MultibyteIncrementalDecoderObject *)(op))
+
+#define _MultibyteStreamReaderObject_CAST(op)   \
+    ((MultibyteStreamReaderObject *)(op))
+#define _MultibyteStreamWriterObject_CAST(op)   \
+    ((MultibyteStreamWriterObject *)(op))
+
 typedef struct {
     PyObject            *inobj;
     Py_ssize_t          inpos, inlen;

Modules/cjkcodecs/multibytecodec.h

@@ -72,28 +72,21 @@ typedef struct {
     PyObject *cjk_module;
 } MultibyteCodecObject;
 
-#define _MultibyteCodec_CAST(op)        ((MultibyteCodec *)(op))
-#define _MultibyteCodecObject_CAST(op)  ((MultibyteCodecObject *)(op))
 #define MultibyteCodec_Check(state, op) Py_IS_TYPE((op), state->multibytecodec_type)
 
 #define _MultibyteStatefulCodec_HEAD            \
     PyObject_HEAD                               \
     const MultibyteCodec *codec;                \
     MultibyteCodec_State state;                 \
     PyObject *errors;
-
 typedef struct {
     _MultibyteStatefulCodec_HEAD
 } MultibyteStatefulCodecContext;
 
-#define _MultibyteStatefulCodecContext_CAST(op) \
-    ((MultibyteStatefulCodecContext *)(op))
-
 #define MAXENCPENDING   2
 #define _MultibyteStatefulEncoder_HEAD          \
     _MultibyteStatefulCodec_HEAD                \
     PyObject *pending;
-
 typedef struct {
     _MultibyteStatefulEncoder_HEAD
 } MultibyteStatefulEncoderContext;
@@ -103,14 +96,10 @@ typedef struct {
     _MultibyteStatefulCodec_HEAD                \
     unsigned char pending[MAXDECPENDING];       \
     Py_ssize_t pendingsize;
-
 typedef struct {
     _MultibyteStatefulDecoder_HEAD
 } MultibyteStatefulDecoderContext;
 
-#define _MultibyteStatefulEncoderContext_CAST(op)   ((MultibyteStatefulEncoderContext *)(op))
-#define _MultibyteStatefulDecoderContext_CAST(op)   ((MultibyteStatefulDecoderContext *)(op))
-
 typedef struct {
     _MultibyteStatefulEncoder_HEAD
 } MultibyteIncrementalEncoderObject;
@@ -119,9 +108,6 @@ typedef struct {
     _MultibyteStatefulDecoder_HEAD
 } MultibyteIncrementalDecoderObject;
 
-#define _MultibyteIncrementalEncoderObject_CAST(op) ((MultibyteIncrementalEncoderObject *)(op))
-#define _MultibyteIncrementalDecoderObject_CAST(op) ((MultibyteIncrementalDecoderObject *)(op))
-
 typedef struct {
     _MultibyteStatefulDecoder_HEAD
     PyObject *stream;
@@ -132,9 +118,6 @@ typedef struct {
     PyObject *stream;
 } MultibyteStreamWriterObject;
 
-#define _MultibyteStreamReaderObject_CAST(op)       ((MultibyteStreamReaderObject *)(op))
-#define _MultibyteStreamWriterObject_CAST(op)       ((MultibyteStreamWriterObject *)(op))
-
 /* positive values for illegal sequences */
 #define MBERR_TOOSMALL          (-1) /* insufficient output buffer space */
 #define MBERR_TOOFEW            (-2) /* incomplete input buffer */