[Intel-gfx] [PATCH] lib: fix #define max

Mika Kuoppala mika.kuoppala at linux.intel.com
Tue Oct 21 17:49:40 CEST 2014


Regression from:

commit be4710a541b517b5f8663448bffed5656d59b47b
Author: Thomas Wood <thomas.wood at intel.com>
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 <jinxianx.guo at intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
---
 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




More information about the Intel-gfx mailing list