From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Jun 2010 13:52:46 +0000 (-0600)
Subject: util/u_debug: use MAX2 macro
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6cc51b982e12d8d03a188c5e033b68e68195e4a7;p=mesa.git

util/u_debug: use MAX2 macro
---

diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index 3d913be6062..954f5706ef3 100644
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -174,12 +174,6 @@ debug_get_num_option(const char *name, long dfault)
    return result;
 }
 
-static INLINE int
-max( int a,
-     int b )
-{
-    return (a > b) ? a : b;
-}
 
 unsigned long
 debug_get_flags_option(const char *name, 
@@ -198,7 +192,7 @@ debug_get_flags_option(const char *name,
       result = dfault;
       debug_printf("%s: help for %s:\n", __FUNCTION__, name);
       for (; flags->name; ++flags)
-         namealign = max(namealign, strlen(flags->name));
+         namealign = MAX2(namealign, strlen(flags->name));
       for (flags = orig; flags->name; ++flags)
          debug_printf("| %*s [0x%0*lx]%s%s\n", namealign, flags->name,
                       sizeof(unsigned long)*CHAR_BIT/4, flags->value,