From: Eric Anholt <eric@anholt.net>
Date: Wed, 12 Jul 2017 20:11:34 +0000 (-0700)
Subject: intel/decoder: Reuse the MAX2 macro instead of defining another one.
X-Git-Tag: android-x86-8.1-r1~11290
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=19ffa4bfb281fb8814f666bac1d0c96a42e6edbb;p=android-x86%2Fexternal-mesa.git

intel/decoder: Reuse the MAX2 macro instead of defining another one.

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

diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c
index ba3a5139aec..60591ad666b 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]) *