[Mesa-dev] [PATCH 1/2] intel/decoder: Reuse the MAX2 macro instead of defining another one.

[Lionel Landwerlin]

This series is :

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

Thanks!

On 13/07/17 19:37, Eric Anholt wrote:
> ---
>   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 ba3a5139aec6..60591ad666bf 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]) *