Merge branch 'master' into gfio

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 7fee4fa423d900a21296a4af37c96a014dcb983f..b9da7b950c2813a0bb53457179b2abd7e1257ef8 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -89,6 +89,7 @@ extern void strip_blank_front(char **);
 extern void strip_blank_end(char *);
 extern int str_to_decimal(const char *, long long *, int, void *);
 extern int check_str_bytes(const char *p, long long *val, void *data);
+extern int str_to_float(const char *str, double *val);
 
 /*
  * Handlers for the options
@@ -100,13 +101,6 @@ typedef int (fio_opt_str_set_fn)(void *);
 
 #define td_var(start, offset)  ((void *) start + (offset))
 
-#ifndef min
-#define min(a, b)      ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b)      ((a) > (b) ? (a) : (b))
-#endif
-
 static inline int parse_is_percent(unsigned long long val)
 {
        return val <= -1ULL && val >= (-1ULL - 100ULL);