[Qemu-devel] [PATCH] cutils: Define min and max marcos

[Yuval Shaia <yuval.shaia@oracle.com>]

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
---
 disas/m68k.c          | 5 +----
 include/qemu/cutils.h | 3 +++
 slirp/slirp.h         | 6 +-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/disas/m68k.c b/disas/m68k.c
index 8e7c3f7..7794abc 100644
--- a/disas/m68k.c
+++ b/disas/m68k.c
@@ -2,6 +2,7 @@
    sourceware.org CVS.  Original file boundaries marked with **** */
 
 #include "qemu/osdep.h"
+#include "qemu/cutils.h"
 #include <math.h>
 
 #include "disas/bfd.h"
@@ -4698,10 +4699,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.  */
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 3e4ea23..9bf0e37 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -180,4 +180,7 @@ bool buffer_is_zero(const void *buf, size_t len);
 int uleb128_encode_small(uint8_t *out, uint32_t n);
 int uleb128_decode_small(const uint8_t *in, uint32_t *n);
 
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#define max(x, y) ((x) > (y) ? (x) : (y))
+
 #endif
diff --git a/slirp/slirp.h b/slirp/slirp.h
index a1f3139..3da8239 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -2,6 +2,7 @@
 #define SLIRP_H
 
 #include "qemu/host-utils.h"
+#include "qemu/cutils.h"
 #include "slirp_config.h"
 
 #ifdef _WIN32
@@ -292,9 +293,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
-- 
1.8.3.1