On Wed, Feb 20, 2019 at 8:05 AM Ruediger Pluem <rpl...@apache.org> wrote:
>
> On 2019/02/19 17:21:09, yla...@apache.org wrote:
> >
> > -#define MERGE_INT(cfg, b, a, val) cfg->val = (a->val == UNSET) ? b->val :
> > a->val;
> > +#define MERGE_INT(cfg, b, a, val) \
> > + cfg->val = (a->val == UNSET) ? b->val : a->val
> > +#define MERGE_STAGE(cfg, b, a, stage) do { \
>
> Shouldn't this be
>
> #define MERGE_STAGE(cfg, base, add, stage) do { \
>
> > + MERGE_INT(cfg, base, add, stage.timeout); \
> > + MERGE_INT(cfg, base, add, stage.max_timeout); \
> > + MERGE_INT(cfg, base, add, stage.min_rate); \
> > + cfg->stage.rate_factor = (cfg->stage.min_rate == UNSET) \
> > + ? base->stage.rate_factor \
> > + : add->stage.rate_factor; \
> > +} while (0)
> > +
Ah yes, thanks! Fixed in r1853929.
Regards,
Yann.
