fifo: use minmax.h instead of rolling its own min/max

[fio.git] / fifo.h

diff --git a/fifo.h b/fifo.h
index 749136530a2c5410867f10caf672c155949daa2f..4b775b0bfc1942eb3f7199968e28678a93835796 100644 (file)
--- a/fifo.h
+++ b/fifo.h
@@ -1,3 +1,5 @@
+#ifndef FIO_FIFO_H
+#define FIO_FIFO_H

 /*
  * A simple FIFO implementation.
  *
 /*
  * A simple FIFO implementation.
  *


@@ -18,6 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */

+#include "minmax.h"
+

 struct fifo {
        unsigned char *buffer;  /* the buffer holding the data */
        unsigned int size;      /* the size of the allocated buffer */
 struct fifo {
        unsigned char *buffer;  /* the buffer holding the data */
        unsigned int size;      /* the size of the allocated buffer */


@@ -40,19 +44,4 @@ static inline unsigned int fifo_room(struct fifo *fifo)
        return fifo->size - fifo->in + fifo->out;
 }
 
        return fifo->size - fifo->in + fifo->out;
 }
 

-#ifndef min
-#define min(x,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);     \
-       (void) (&_x == &_y);            \
-       _x > _y ? _x : _y; })
-

 #endif
 #endif