Module: Mesa Branch: master Commit: 19ffa4bfb281fb8814f666bac1d0c96a42e6edbb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=19ffa4bfb281fb8814f666bac1d0c96a42e6edbb
Author: Eric Anholt <e...@anholt.net> Date: Wed Jul 12 13:11:34 2017 -0700 intel/decoder: Reuse the MAX2 macro instead of defining another one. Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> --- src/intel/common/gen_decoder.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c index ba3a5139ae..60591ad666 100644 --- a/src/intel/common/gen_decoder.c +++ b/src/intel/common/gen_decoder.c @@ -39,8 +39,6 @@ #define XML_BUFFER_SIZE 4096 -#define MAX(a, b) ((a) < (b) ? (b) : (a)) - #define MAKE_GEN(major, minor) ( ((major) << 8) | (minor) ) struct gen_spec { @@ -381,7 +379,7 @@ create_and_append_field(struct parser_context *ctx, const char **atts) { if (ctx->group->nfields == ctx->group->fields_size) { - ctx->group->fields_size = MAX(ctx->group->fields_size * 2, 2); + ctx->group->fields_size = MAX2(ctx->group->fields_size * 2, 2); ctx->group->fields = (struct gen_field **) realloc(ctx->group->fields, sizeof(ctx->group->fields[0]) * _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit