Skip to contentSkip to conversation

lib: fix #define max

PATCH In review Mika Kuoppala 3 participants 3 messages Oct 21, 2014 – Oct 23, 2014 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib: fix #define max

Regression from:

commit be4710a541b517b5f8663448bffed5656d59b47b

Author: Thomas Wood <[email protected]>
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

---
 lib/igt_aux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/igt_aux.h +1 -1
index 415614b..9b42918 100644
@@ -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 */
Signature · 1 line
1.9.1
#1 lore raw
Quoted 11 lines · Mika Kuoppala

Regression from:

commit be4710a541b517b5f8663448bffed5656d59b47b

Author: Thomas Wood <[email protected]>
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

Push it already!

Quoted 23 lines
---
 lib/igt_aux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/igt_aux.h +1 -1
index 415614b..9b42918 100644
@@ -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 */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
#2 lore raw
Quoted 7 lines · Jani Nikula
Quoted 6 lines · Mika Kuoppala

Regression from:

commit be4710a541b517b5f8663448bffed5656d59b47b

Author: Thomas Wood <[email protected]>
Date:   Fri Oct 10 11:20:35 2014 +0100
Quoted 7 lines
Quoted 5 lines

lib: add common min and max macros

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85218

Push it already!

To clarify igt process: If you're patch has been sitting on the m-l for a day or so without objection, just push it. If it's critical (like this one) and you're confident it's good push right after sending.

Submitting to intel-gfx for igt patches is mostly so that other people can watch what flies by and drop suggestions for later improvements. And of course new contributors get the full review treatment to make sure they use all the nice stuff the testsuite provides properly. -Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch