zbd: Fix zone report handling

[fio.git] / minmax.h

diff --git a/minmax.h b/minmax.h
index e5c2f584714fe877d7b119d16683f0a3cdd7146f..ec0848c0d67c7f84c549868e60f5063150a0cdeb 100644 (file)
--- a/minmax.h
+++ b/minmax.h
@@ -2,10 +2,24 @@
 #define FIO_MIN_MAX_H
 
 #ifndef min
-#define min(a, b)      ((a) < (b) ? (a) : (b))
+#define min(x,y) ({ \
+       __typeof__(x) _x = (x); \
+       __typeof__(y) _y = (y); \
+       (void) (&_x == &_y);            \
+       _x < _y ? _x : _y; })
 #endif
+
 #ifndef max
-#define max(a, b)      ((a) > (b) ? (a) : (b))
+#define max(x,y) ({ \
+       __typeof__(x) _x = (x); \
+       __typeof__(y) _y = (y); \
+       (void) (&_x == &_y);            \
+       _x > _y ? _x : _y; })
 #endif
 
+#define min_not_zero(x, y) ({          \
+       __typeof__(x) __x = (x);                \
+       __typeof__(y) __y = (y);                \
+       __x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); })
+
 #endif