From 41a63556cffb13d38135fcb152b266c0fe72cef2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 May 2019 18:09:04 +1000 Subject: Revert "Cleanup: add semicolon after PyObject_VAR_HEAD" This reverts commit a01bcfa6366f893fbc8fdbf537d91ece4832ea03. This causes MSVC2019 build to fail with error C2059 Unfortunately this means we have to put up with bad formatting in Python structs. --- source/blender/python/bmesh/bmesh_py_types.h | 27 ++++++++-------------- .../python/bmesh/bmesh_py_types_customdata.h | 9 +++----- .../blender/python/bmesh/bmesh_py_types_meshdata.c | 9 +++----- .../blender/python/bmesh/bmesh_py_types_meshdata.h | 3 +-- .../blender/python/bmesh/bmesh_py_types_select.h | 6 ++--- source/blender/python/generic/bgl.h | 3 +-- source/blender/python/generic/idprop_py_api.h | 13 ++++------- source/blender/python/generic/imbuf_py_api.c | 6 ++--- source/blender/python/gpu/gpu_py_batch.h | 6 ++--- source/blender/python/gpu/gpu_py_element.h | 3 +-- source/blender/python/gpu/gpu_py_shader.h | 3 +-- source/blender/python/gpu/gpu_py_vertex_buffer.h | 6 ++--- source/blender/python/gpu/gpu_py_vertex_format.h | 3 +-- source/blender/python/mathutils/mathutils.h | 3 +-- 14 files changed, 37 insertions(+), 63 deletions(-) diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h index e37a88a53b0..460e7f82222 100644 --- a/source/blender/python/bmesh/bmesh_py_types.h +++ b/source/blender/python/bmesh/bmesh_py_types.h @@ -54,45 +54,38 @@ extern PyTypeObject BPy_BMIter_Type; /* cast from _any_ bmesh type - they all have BMesh first */ typedef struct BPy_BMGeneric { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ } BPy_BMGeneric; /* BPy_BMVert/BPy_BMEdge/BPy_BMFace/BPy_BMLoop can cast to this */ typedef struct BPy_BMElem { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ struct BMElem *ele; } BPy_BMElem; typedef struct BPy_BMesh { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ int flag; } BPy_BMesh; /* element types */ typedef struct BPy_BMVert { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ struct BMVert *v; } BPy_BMVert; typedef struct BPy_BMEdge { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ struct BMEdge *e; } BPy_BMEdge; typedef struct BPy_BMFace { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ struct BMFace *f; } BPy_BMFace; typedef struct BPy_BMLoop { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ struct BMLoop *l; } BPy_BMLoop; @@ -106,8 +99,7 @@ typedef struct BPy_BMLoop { * - BPy_BMLoopSeq_Type */ typedef struct BPy_BMElemSeq { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ /* if this is a sequence on an existing element, * loops of faces for eg. @@ -123,8 +115,7 @@ typedef struct BPy_BMElemSeq { } BPy_BMElemSeq; typedef struct BPy_BMIter { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ BMIter iter; } BPy_BMIter; diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.h b/source/blender/python/bmesh/bmesh_py_types_customdata.h index 96ca2cb6ace..95836707e3d 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.h +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.h @@ -39,23 +39,20 @@ extern PyTypeObject BPy_BMLayerItem_Type; /* all layers for vert/edge/face/loop */ typedef struct BPy_BMLayerAccess { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ char htype; } BPy_BMLayerAccess; /* access different layer types deform/uv/vertexcolor */ typedef struct BPy_BMLayerCollection { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ char htype; int type; /* customdata type - CD_XXX */ } BPy_BMLayerCollection; /* access a specific layer directly */ typedef struct BPy_BMLayerItem { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ char htype; int type; /* customdata type - CD_XXX */ int index; /* index of this layer type */ diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index c7133fcbf3a..0aa01ddb594 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -48,8 +48,7 @@ #define BPy_BMLoopUV_Check(v) (Py_TYPE(v) == &BPy_BMLoopUV_Type) typedef struct BPy_BMLoopUV { - PyObject_VAR_HEAD; - MLoopUV *data; + PyObject_VAR_HEAD MLoopUV *data; } BPy_BMLoopUV; PyDoc_STRVAR(bpy_bmloopuv_uv_doc, @@ -168,8 +167,7 @@ PyObject *BPy_BMLoopUV_CreatePyObject(struct MLoopUV *mloopuv) #define BPy_BMVertSkin_Check(v) (Py_TYPE(v) == &BPy_BMVertSkin_Type) typedef struct BPy_BMVertSkin { - PyObject_VAR_HEAD; - MVertSkin *data; + PyObject_VAR_HEAD MVertSkin *data; } BPy_BMVertSkin; PyDoc_STRVAR(bpy_bmvertskin_radius_doc, @@ -407,8 +405,7 @@ PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *data) #define BPy_BMDeformVert_Check(v) (Py_TYPE(v) == &BPy_BMDeformVert_Type) typedef struct BPy_BMDeformVert { - PyObject_VAR_HEAD; - MDeformVert *data; + PyObject_VAR_HEAD MDeformVert *data; } BPy_BMDeformVert; /* Mapping Protocols diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.h b/source/blender/python/bmesh/bmesh_py_types_meshdata.h index 85fb42558e7..5211c30ec7e 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.h +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.h @@ -30,8 +30,7 @@ extern PyTypeObject BPy_BMDeformVert_Type; #define BPy_BMLoopUV_Check(v) (Py_TYPE(v) == &BPy_BMLoopUV_Type) typedef struct BPy_BMGenericMeshData { - PyObject_VAR_HEAD; - void *data; + PyObject_VAR_HEAD void *data; } BPy_BMGenericMeshData; struct MDeformVert; diff --git a/source/blender/python/bmesh/bmesh_py_types_select.h b/source/blender/python/bmesh/bmesh_py_types_select.h index 2fee3e23841..593857a5083 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.h +++ b/source/blender/python/bmesh/bmesh_py_types_select.h @@ -33,13 +33,11 @@ extern PyTypeObject BPy_BMEditSelIter_Type; #define BPy_BMSelectHistoryIter_Check(v) (Py_TYPE(v) == &BPy_BMEditSelIter_Type) typedef struct BPy_BMEditSelSeq { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ } BPy_BMEditSelSeq; typedef struct BPy_BMEditSelIter { - PyObject_VAR_HEAD; - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ struct BMEditSelection *ese; } BPy_BMEditSelIter; diff --git a/source/blender/python/generic/bgl.h b/source/blender/python/generic/bgl.h index a8bd3ecff69..8c81dc48340 100644 --- a/source/blender/python/generic/bgl.h +++ b/source/blender/python/generic/bgl.h @@ -33,8 +33,7 @@ int BGL_typeSize(int type); * For Python access to OpenGL functions requiring a pointer. */ typedef struct _Buffer { - PyObject_VAR_HEAD; - PyObject *parent; + PyObject_VAR_HEAD PyObject *parent; int type; /* GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT */ int ndimensions; diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.h index 334be96759d..49094f95ecb 100644 --- a/source/blender/python/generic/idprop_py_api.h +++ b/source/blender/python/generic/idprop_py_api.h @@ -37,22 +37,19 @@ extern PyTypeObject BPy_IDGroup_Type; #define BPy_IDGroup_CheckExact(v) (Py_TYPE(v) == &BPy_IDGroup_Type) typedef struct BPy_IDProperty { - PyObject_VAR_HEAD; - struct ID *id; /* can be NULL */ - struct IDProperty *prop; /* must be second member */ + PyObject_VAR_HEAD struct ID *id; /* can be NULL */ + struct IDProperty *prop; /* must be second member */ struct IDProperty *parent; PyObject *data_wrap; } BPy_IDProperty; typedef struct BPy_IDArray { - PyObject_VAR_HEAD; - struct ID *id; /* can be NULL */ - struct IDProperty *prop; /* must be second member */ + PyObject_VAR_HEAD struct ID *id; /* can be NULL */ + struct IDProperty *prop; /* must be second member */ } BPy_IDArray; typedef struct BPy_IDGroup_Iter { - PyObject_VAR_HEAD; - BPy_IDProperty *group; + PyObject_VAR_HEAD BPy_IDProperty *group; struct IDProperty *cur; int mode; } BPy_IDGroup_Iter; diff --git a/source/blender/python/generic/imbuf_py_api.c b/source/blender/python/generic/imbuf_py_api.c index b848f9a3524..26e4e5bcf32 100644 --- a/source/blender/python/generic/imbuf_py_api.c +++ b/source/blender/python/generic/imbuf_py_api.c @@ -46,9 +46,9 @@ static PyObject *Py_ImBuf_CreatePyObject(ImBuf *ibuf); * \{ */ typedef struct Py_ImBuf { - PyObject_VAR_HEAD; - /* can be NULL */ - ImBuf *ibuf; + PyObject_VAR_HEAD + /* can be NULL */ + ImBuf *ibuf; } Py_ImBuf; static int py_imbuf_valid_check(Py_ImBuf *self) diff --git a/source/blender/python/gpu/gpu_py_batch.h b/source/blender/python/gpu/gpu_py_batch.h index 5ec1857fc1a..1e916afcc2e 100644 --- a/source/blender/python/gpu/gpu_py_batch.h +++ b/source/blender/python/gpu/gpu_py_batch.h @@ -30,9 +30,9 @@ extern PyTypeObject BPyGPUBatch_Type; #define BPyGPUBatch_Check(v) (Py_TYPE(v) == &BPyGPUBatch_Type) typedef struct BPyGPUBatch { - PyObject_VAR_HEAD; - /* The batch is owned, we may support thin wrapped batches later. */ - struct GPUBatch *batch; + PyObject_VAR_HEAD + /* The batch is owned, we may support thin wrapped batches later. */ + struct GPUBatch *batch; #ifdef USE_GPU_PY_REFERENCES /* Just to keep a user to prevent freeing buf's we're using */ PyObject *references; diff --git a/source/blender/python/gpu/gpu_py_element.h b/source/blender/python/gpu/gpu_py_element.h index 9d70379a2ec..055c9d54ecf 100644 --- a/source/blender/python/gpu/gpu_py_element.h +++ b/source/blender/python/gpu/gpu_py_element.h @@ -26,8 +26,7 @@ extern PyTypeObject BPyGPUIndexBuf_Type; #define BPyGPUIndexBuf_Check(v) (Py_TYPE(v) == &BPyGPUIndexBuf_Type) typedef struct BPyGPUIndexBuf { - PyObject_VAR_HEAD; - struct GPUIndexBuf *elem; + PyObject_VAR_HEAD struct GPUIndexBuf *elem; } BPyGPUIndexBuf; PyObject *BPyGPUIndexBuf_CreatePyObject(struct GPUIndexBuf *elem); diff --git a/source/blender/python/gpu/gpu_py_shader.h b/source/blender/python/gpu/gpu_py_shader.h index 4d59dbc8e37..92873753039 100644 --- a/source/blender/python/gpu/gpu_py_shader.h +++ b/source/blender/python/gpu/gpu_py_shader.h @@ -26,8 +26,7 @@ extern PyTypeObject BPyGPUShader_Type; #define BPyGPUShader_Check(v) (Py_TYPE(v) == &BPyGPUShader_Type) typedef struct BPyGPUShader { - PyObject_VAR_HEAD; - struct GPUShader *shader; + PyObject_VAR_HEAD struct GPUShader *shader; bool is_builtin; } BPyGPUShader; diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.h b/source/blender/python/gpu/gpu_py_vertex_buffer.h index 484508b8875..b7124d245a9 100644 --- a/source/blender/python/gpu/gpu_py_vertex_buffer.h +++ b/source/blender/python/gpu/gpu_py_vertex_buffer.h @@ -28,9 +28,9 @@ extern PyTypeObject BPyGPUVertBuf_Type; #define BPyGPUVertBuf_Check(v) (Py_TYPE(v) == &BPyGPUVertBuf_Type) typedef struct BPyGPUVertBuf { - PyObject_VAR_HEAD; - /* The buf is owned, we may support thin wrapped batches later. */ - struct GPUVertBuf *buf; + PyObject_VAR_HEAD + /* The buf is owned, we may support thin wrapped batches later. */ + struct GPUVertBuf *buf; } BPyGPUVertBuf; PyObject *BPyGPUVertBuf_CreatePyObject(struct GPUVertBuf *vbo) ATTR_NONNULL(1); diff --git a/source/blender/python/gpu/gpu_py_vertex_format.h b/source/blender/python/gpu/gpu_py_vertex_format.h index dc100586f59..8ef466aa918 100644 --- a/source/blender/python/gpu/gpu_py_vertex_format.h +++ b/source/blender/python/gpu/gpu_py_vertex_format.h @@ -28,8 +28,7 @@ extern PyTypeObject BPyGPUVertFormat_Type; #define BPyGPUVertFormat_Check(v) (Py_TYPE(v) == &BPyGPUVertFormat_Type) typedef struct BPyGPUVertFormat { - PyObject_VAR_HEAD; - struct GPUVertFormat fmt; + PyObject_VAR_HEAD struct GPUVertFormat fmt; } BPyGPUVertFormat; PyObject *BPyGPUVertFormat_CreatePyObject(struct GPUVertFormat *fmt); diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index 84e1c5869bc..8afd60a7324 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -53,8 +53,7 @@ enum { #define BASE_MATH_MEMBERS(_data) \ /** Array of data (alias), wrapped status depends on wrapped status. */ \ - PyObject_VAR_HEAD; \ - float *_data; \ + PyObject_VAR_HEAD float *_data; \ /** If this vector references another object, otherwise NULL, *Note* this owns its reference */ \ PyObject *cb_user; \ /** Which user funcs do we adhere to, RNA, etc */ \ -- cgit v1.2.3