From 893dcdbfa9c345945e6b501ebbf7a0f78ad08180 Mon Sep 17 00:00:00 2001 From: Yuval Shaia Date: Tue, 29 Nov 2016 17:07:34 +0200 Subject: slirp, disas: Replace min/max with MIN/MAX macros Signed-off-by: Yuval Shaia Reviewed-by: Markus Armbruster Reviewed-by: Laurent Vivier Signed-off-by: Samuel Thibault --- disas/m68k.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'disas') diff --git a/disas/m68k.c b/disas/m68k.c index 8e7c3f76c4..073abb9efd 100644 --- a/disas/m68k.c +++ b/disas/m68k.c @@ -4698,10 +4698,6 @@ get_field (const unsigned char *data, enum floatformat_byteorders order, return result; } -#ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#endif - /* Convert from FMT to a double. FROM is the address of the extended float. Store the double in *TO. */ @@ -4733,7 +4729,7 @@ floatformat_to_double (const struct floatformat *fmt, nan = 0; while (mant_bits_left > 0) { - mant_bits = min (mant_bits_left, 32); + mant_bits = MIN(mant_bits_left, 32); if (get_field (ufrom, fmt->byteorder, fmt->totalsize, mant_off, mant_bits) != 0) @@ -4793,7 +4789,7 @@ floatformat_to_double (const struct floatformat *fmt, while (mant_bits_left > 0) { - mant_bits = min (mant_bits_left, 32); + mant_bits = MIN(mant_bits_left, 32); mant = get_field (ufrom, fmt->byteorder, fmt->totalsize, mant_off, mant_bits); -- cgit v1.2.1