aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-06-03 07:52:46 -0600
committerBrian Paul <[email protected]>2010-06-03 07:52:46 -0600
commit6cc51b982e12d8d03a188c5e033b68e68195e4a7 (patch)
tree01d24d1f17eec6714f3d6cc6fd67fb8ce523224e
parent81862bbbc82341b1271fc4bc7b803d409826aeba (diff)
util/u_debug: use MAX2 macro
-rw-r--r--src/gallium/auxiliary/util/u_debug.c8
1 files changed, 1 insertions, 7 deletions
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,