diff options
| author | Yuval Shaia <yuval.shaia@oracle.com> | 2016-11-29 17:07:34 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-12-20 23:55:19 +0100 |
| commit | 893dcdbfa9c345945e6b501ebbf7a0f78ad08180 (patch) | |
| tree | 5dd593508734dc100875dcd34671a643a16f60ef /disas/m68k.c | |
| parent | 82ecffa8c050bf5bbc13329e9b65eac1caa5b55c (diff) | |
| download | qemu-893dcdbfa9c345945e6b501ebbf7a0f78ad08180.zip qemu-893dcdbfa9c345945e6b501ebbf7a0f78ad08180.tar.gz qemu-893dcdbfa9c345945e6b501ebbf7a0f78ad08180.tar.bz2 | |
slirp, disas: Replace min/max with MIN/MAX macros
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'disas/m68k.c')
| -rw-r--r-- | disas/m68k.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/disas/m68k.c b/disas/m68k.c index 8e7c3f7..073abb9 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); |