diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-03-18 15:02:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-18 15:02:04 -0800 |
| commit | 65a0fc80efe696baf246464cc6b62190b1678303 (patch) | |
| tree | 6b6a76ae78fe95cb70ffee4c5b8fd55d7471e4ff /lib | |
| parent | 688d6d304655476d3a1f93241e612164a420ba21 (diff) | |
| download | history-65a0fc80efe696baf246464cc6b62190b1678303.tar.gz | |
[PATCH] zlib: use kernel min/max
From: "Randy.Dunlap" <rddunlap@osdl.org>
From: Michael Veeck <michael.veeck@gmx.net>
Remove unnecessary min/max macros and changes calls to use kernel.h macros
instead.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/zlib_deflate/deftree.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/zlib_deflate/deftree.c b/lib/zlib_deflate/deftree.c index e4253f965b5cab..ddf348299f244a 100644 --- a/lib/zlib_deflate/deftree.c +++ b/lib/zlib_deflate/deftree.c @@ -217,10 +217,6 @@ static void send_bits( } #endif /* DEBUG_ZLIB */ - -#define MAX(a,b) (a >= b ? a : b) -/* the arguments must not have side effects */ - /* =========================================================================== * Initialize the various 'constant' tables. In a multi-threaded environment, * this function may be called by two threads concurrently, but this is @@ -598,7 +594,7 @@ static void build_tree( /* Create a new node father of n and m */ tree[node].Freq = tree[n].Freq + tree[m].Freq; - s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1); + s->depth[node] = (uch) (max(s->depth[n], s->depth[m]) + 1); tree[n].Dad = tree[m].Dad = (ush)node; #ifdef DUMP_BL_TREE if (tree == s->bl_tree) { |