C++ has its own min(); and xfsprog's min() interferes with it. (It's likely to interfere with C applications too, so maybe it should be moved to an internal header) Signed-off-by: Avi Kivity <avi@xxxxxxxxxxxx> --- include/platform_defs.h.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index 30dd7a4..aaabed6 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -74,10 +74,12 @@ typedef unsigned short umode_t; | (minor&IRIX_DEV_MAXMIN))) #define IRIX_DEV_TO_KDEVT(dev) makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev)) +#ifndef __cplusplus #ifndef min #define min(a,b) (((a)<(b))?(a):(b)) #define max(a,b) (((a)>(b))?(a):(b)) #endif +#endif #ifndef NBBY #define NBBY 8 -- 2.4.3 _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
