From: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> --- include/libxfs.h | 1 - include/platform_defs.h.in | 5 +++++ io/init.h | 3 --- libxfs/rdwr.c | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/libxfs.h b/include/libxfs.h index bc6530e..defaab5 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -71,7 +71,6 @@ #define __round_mask(x, y) ((__typeof__(x))((y)-1)) #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1) #define round_down(x, y) ((x) & ~__round_mask(x, y)) -#define min(a,b) ((a) < (b) ? (a) : (b)) /* * Argument structure for libxfs_init(). diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index 217d6c0..03391f5 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -168,4 +168,9 @@ typedef unsigned long long __psunsigned_t; #define __arch_pack #endif +#ifndef min +#define min(a,b) (((a)<(b))?(a):(b)) +#define max(a,b) (((a)>(b))?(a):(b)) +#endif + #endif /* __XFS_PLATFORM_DEFS_H__ */ diff --git a/io/init.h b/io/init.h index 1dac211..d773b1b 100644 --- a/io/init.h +++ b/io/init.h @@ -26,7 +26,4 @@ extern int expert; extern size_t pagesize; extern struct timeval stopwatch; -#define min(a,b) (((a)<(b))?(a):(b)) -#define max(a,b) (((a)>(b))?(a):(b)) - extern void init_cvtnum(size_t *blocksize, size_t *sectsize); diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index c679f81..93beb23 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -22,7 +22,6 @@ #include "init.h" #define BDSTRAT_SIZE (256 * 1024) -#define min(x, y) ((x) < (y) ? (x) : (y)) #define IO_BCOMPARE_CHECK -- 1.7.10.4 _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
