From a6e1586b1b2b5ff5d009ca958bd9336d379023d3 Mon Sep 17 00:00:00 2001 From: Tyge Date: Mon, 27 Apr 2020 22:42:31 +0200 Subject: Removed non-standard GNU extension usage. --- stc/carray.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stc/carray.h b/stc/carray.h index c2151875..502a0038 100644 --- a/stc/carray.h +++ b/stc/carray.h @@ -49,12 +49,12 @@ int main() } */ -#define carray_xdim(a) ((a).xdim) -#define carray_ydim(a) ({const uint32_t* d__ = &(a)._yxdim; d__[0] / d__[-1];}) -#define carray_zdim(a) ((a)._zdim) +#define carray_xdim(a) ((a).xdim) +#define carray_ydim(a) ((a)._yxdim / (a).xdim) +#define carray_zdim(a) ((a)._zdim) #define carray1_size(a) ((a).xdim) #define carray2_size(a) ((a)._yxdim) -#define carray3_size(a) ({const uint32_t* d__ = &(a)._zdim; d__[0] * d__[-1];}) +#define carray3_size(a) ((a)._zdim * (a)._yxdim) #define carray_destroy(a) free((a)._array) #define declare_CArray(tag, T) \ -- cgit v1.2.3