From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] lib: fix #define max Date: Wed, 22 Oct 2014 21:32:23 +0300 Message-ID: <87h9ywgdl4.fsf@intel.com> References: <1413906580-4840-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id B52246E362 for ; Wed, 22 Oct 2014 11:33:37 -0700 (PDT) In-Reply-To: <1413906580-4840-1-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Mika Kuoppala , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 21 Oct 2014, Mika Kuoppala wrote: > Regression from: > > commit be4710a541b517b5f8663448bffed5656d59b47b > Author: Thomas Wood > Date: Fri Oct 10 11:20:35 2014 +0100 > > lib: add common min and max macros > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85218 > Tested-by: Guo Jinxian > Signed-off-by: Mika Kuoppala Push it already! > --- > lib/igt_aux.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/igt_aux.h b/lib/igt_aux.h > index 415614b..9b42918 100644 > --- a/lib/igt_aux.h > +++ b/lib/igt_aux.h > @@ -85,6 +85,6 @@ bool intel_check_memory(uint32_t count, uint32_t size, unsigned mode); > > > #define min(a, b) ((a) < (b) ? (a) : (b)) > -#define max(a, b) ((a) < (b) ? (a) : (b)) > +#define max(a, b) ((a) > (b) ? (a) : (b)) > > #endif /* IGT_AUX_H */ > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center