commit 30afd42626ea95e7a456d697ca8fbbf234e058db
parent 8c8fefd2777b5f591f28e2b5cb7a3f9e4d4205d6
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 13 Oct 2021 18:25:15 +0200
Fix compilation warnings detected by gcc 11
Diffstat:
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/test_s2d_shape.c b/src/test_s2d_shape.c
@@ -53,8 +53,8 @@ main(int argc, char** argv)
struct s2d_shape* shape_copy;
struct s2d_vertex_data vdata[4];
struct s2d_attrib attr;
- const unsigned nsegs = sizeof(square_ids) / sizeof(unsigned[2]);
- const unsigned nverts = sizeof(square_verts) / sizeof(float[2]);
+ const unsigned nsegs = square_nsegs;
+ const unsigned nverts = square_nverts;
unsigned n;
unsigned ids[2];
unsigned id;
diff --git a/src/test_s2d_utils.h b/src/test_s2d_utils.h
@@ -46,7 +46,7 @@ static const float square_verts[] = {
9.f, 11.f,
11.f, 11.f
};
-const unsigned square_nverts = sizeof(square_verts)/sizeof(float[2]);
+const unsigned square_nverts = sizeof(square_verts)/(sizeof(float)*2);
const unsigned square_ids[] = {
0, 1, /* Bottom */
@@ -54,14 +54,14 @@ const unsigned square_ids[] = {
2, 3, /* Top */
3, 0 /* Right */
};
-const unsigned square_nsegs = sizeof(square_ids)/sizeof(unsigned[2]);
+const unsigned square_nsegs = sizeof(square_ids)/(sizeof(unsigned)*2);
static const struct line_segments_desc square_desc = { square_verts, square_ids };
static const float line_verts[] = { 9.f, 10.f, 11.f, 10.f };
-const unsigned line_nverts = sizeof(line_verts)/sizeof(float[2]);
+const unsigned line_nverts = sizeof(line_verts)/(sizeof(float)*2);
const unsigned line_ids[] = { 0, 1 };
-const unsigned line_nsegs = sizeof(line_ids)/sizeof(unsigned[2]);
+const unsigned line_nsegs = sizeof(line_ids)/(sizeof(unsigned)*2);
static const struct line_segments_desc line_desc = { line_verts, line_ids };
static INLINE void