aboutsummaryrefslogtreecommitdiff
path: root/slirp/tcpip.h
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
commit893dcdbfa9c345945e6b501ebbf7a0f78ad08180 (patch)
tree5dd593508734dc100875dcd34671a643a16f60ef /slirp/tcpip.h
parent82ecffa8c050bf5bbc13329e9b65eac1caa5b55c (diff)
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/tcpip.h')
-rw-r--r--slirp/tcpip.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/slirp/tcpip.h b/slirp/tcpip.h
index 7bdb971c5d..07dbf2c432 100644
--- a/slirp/tcpip.h
+++ b/slirp/tcpip.h
@@ -85,7 +85,7 @@ struct tcpiphdr {
/* This is the difference between the size of a tcpiphdr structure, and the
* size of actual ip+tcp headers, rounded up since we need to align data. */
#define TCPIPHDR_DELTA\
- (max(0,\
+ (MAX(0,\
(sizeof(struct tcpiphdr)\
- sizeof(struct ip) - sizeof(struct tcphdr) + 3) & ~3))