aboutsummaryrefslogtreecommitdiff
path: root/slirp.c
diff options
context:
space:
mode:
authorYuval Shaia <yuval.shaia@oracle.com>2016-11-29 17:07:34 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-12-20 23:55:19 +0100
commitde84ddafe4a4a25835923e28fa9033cdead04f14 (patch)
tree668ab5f2b51e138c07404385eae527bcb39308d5 /slirp.c
parente1619211e9af886fad074a7826064d09c40a5e94 (diff)
downloadslirp-de84ddafe4a4a25835923e28fa9033cdead04f14.zip
slirp-de84ddafe4a4a25835923e28fa9033cdead04f14.tar.gz
slirp-de84ddafe4a4a25835923e28fa9033cdead04f14.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 'slirp.c')
-rw-r--r--slirp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/slirp.c b/slirp.c
index 2c1122e..7e24fdf 100644
--- a/slirp.c
+++ b/slirp.c
@@ -767,7 +767,7 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
{
struct slirp_arphdr *ah = (struct slirp_arphdr *)(pkt + ETH_HLEN);
- uint8_t arp_reply[max(ETH_HLEN + sizeof(struct slirp_arphdr), 64)];
+ uint8_t arp_reply[MAX(ETH_HLEN + sizeof(struct slirp_arphdr), 64)];
struct ethhdr *reh = (struct ethhdr *)arp_reply;
struct slirp_arphdr *rah = (struct slirp_arphdr *)(arp_reply + ETH_HLEN);
int ar_op;