summaryrefslogtreecommitdiffstats
path: root/slirp/slirp.c
diff options
context:
space:
mode:
authorYuval Shaia2016-11-29 16:07:34 +0100
committerSamuel Thibault2016-12-20 23:55:19 +0100
commit893dcdbfa9c345945e6b501ebbf7a0f78ad08180 (patch)
tree5dd593508734dc100875dcd34671a643a16f60ef /slirp/slirp.c
parentOpen 2.9 development tree (diff)
downloadqemu-893dcdbfa9c345945e6b501ebbf7a0f78ad08180.tar.gz
qemu-893dcdbfa9c345945e6b501ebbf7a0f78ad08180.tar.xz
qemu-893dcdbfa9c345945e6b501ebbf7a0f78ad08180.zip
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/slirp.c')
-rw-r--r--slirp/slirp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 6e2b4e5a90..60539de7a3 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -774,7 +774,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;