From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58997)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1cAIOf-0006Ck-2v
	for qemu-devel@nongnu.org; Fri, 25 Nov 2016 10:26:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1cAIOa-0004CV-7U
	for qemu-devel@nongnu.org; Fri, 25 Nov 2016 10:26:41 -0500
Received: from mx1.redhat.com ([209.132.183.28]:38278)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <armbru@redhat.com>) id 1cAIOa-0004BY-1j
	for qemu-devel@nongnu.org; Fri, 25 Nov 2016 10:26:36 -0500
From: Markus Armbruster <armbru@redhat.com>
References: <1480069886-11703-1-git-send-email-yuval.shaia@oracle.com>
Date: Fri, 25 Nov 2016 16:26:32 +0100
In-Reply-To: <1480069886-11703-1-git-send-email-yuval.shaia@oracle.com> (Yuval
	Shaia's message of "Fri, 25 Nov 2016 12:31:26 +0200")
Message-ID: <87k2br8tsn.fsf@dusky.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [Qemu-devel] [PATCH] cutils: Define min and max marcos
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Yuval Shaia <yuval.shaia@oracle.com>
Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, samuel.thibault@ens-lyon.org, jan.kiszka@siemens.com

Yuval Shaia <yuval.shaia@oracle.com> writes:

> 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

Please use MIN() and MAX() from osdep.h instead.