X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=minmax.h;h=ec0848c0d67c7f84c549868e60f5063150a0cdeb;hp=97957c8874e2e68b6e84a318d70c7c62670501bf;hb=7f125e7f3879d23e79bc2ef5eed678ddab3b5c70;hpb=f747ad2c5352b977007997b454333be37de7f4c9

diff --git a/minmax.h b/minmax.h
index 97957c88..ec0848c0 100644
--- a/minmax.h
+++ b/minmax.h
@@ -3,18 +3,23 @@
 
 #ifndef min
 #define min(x,y) ({ \
-	typeof(x) _x = (x);	\
-	typeof(y) _y = (y);	\
+	__typeof__(x) _x = (x);	\
+	__typeof__(y) _y = (y);	\
 	(void) (&_x == &_y);		\
 	_x < _y ? _x : _y; })
 #endif
 
 #ifndef max
 #define max(x,y) ({ \
-	typeof(x) _x = (x);	\
-	typeof(y) _y = (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