aboutsummaryrefslogtreecommitdiff
path: root/slirp/slirp.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/slirp.h
parent82ecffa8c050bf5bbc13329e9b65eac1caa5b55c (diff)
downloadqemu-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 'slirp/slirp.h')
-rw-r--r--slirp/slirp.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h
index a1f3139..3877f66 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -292,9 +292,4 @@ int tcp_emu(struct socket *, struct mbuf *);
int tcp_ctl(struct socket *);
struct tcpcb *tcp_drop(struct tcpcb *tp, int err);
-#ifndef _WIN32
-#define min(x,y) ((x) < (y) ? (x) : (y))
-#define max(x,y) ((x) > (y) ? (x) : (y))
-#endif
-
#endif