X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=common%2Farray.h;fp=common%2Farray.h;h=cd0090a181c2af7d67b344cf106f6840695bfc1e;hb=a3eac0731ffb3a31b57f9feed0256678f187f2a1;hp=fe3dded2074908f1ee1857627331b041665fd737;hpb=bc1f4bbff3c59eaaf70d3d77dfa635f52bebb068;p=apps%2Fpfixtools.git diff --git a/common/array.h b/common/array.h index fe3dded..cd0090a 100644 --- a/common/array.h +++ b/common/array.h @@ -111,9 +111,9 @@ array_ensure_capacity_delta(array, 1); \ (array).data[(array).len++] = (obj); \ } while (0) -#define array_append(array, objs, len) \ +#define array_append(array, objs, Len) \ do { \ - const typeof((array).len) __len = (len); \ + const typeof((array).len) __len = (Len); \ array_ensure_capacity_delta(array, __len); \ memcpy((array).data + (array).len, objs, \ __len * sizeof(*(array).data)); \ @@ -143,8 +143,8 @@ array_ensure_can_edit(array); \ p_shrink(&(array).data, (array).len, &(array).size); \ } while (0) -#define array_elt(array, n) (array).data[(n)] -#define array_ptr(array, n) (array).data + (n) +#define array_elt(array, n) ((array).data[(n)]) +#define array_ptr(array, n) ((array).data + (n)) #define foreach(var, array) \ for (uint32_t __Ai = 0 ; __Ai < (array).len ; ++__Ai) { \