From 95666504583968cbd1b9873f29efe88d5b8269eb Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 10 Jan 2014 18:03:25 +0000 Subject: [PATCH] Per Marco, don't define a "min" function if one is already defined to avoid conflict with cygwin reserved word This commit was SVN r30241. --- ompi/mca/coll/sm/coll_sm_reduce.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ompi/mca/coll/sm/coll_sm_reduce.c b/ompi/mca/coll/sm/coll_sm_reduce.c index 96716faa2a..510e50d0a9 100644 --- a/ompi/mca/coll/sm/coll_sm_reduce.c +++ b/ompi/mca/coll/sm/coll_sm_reduce.c @@ -52,10 +52,12 @@ static int reduce_no_order(void *sbuf, void* rbuf, int count, /* * Useful utility routine */ +#if !defined(min) static inline int min(int a, int b) { return (a < b) ? a : b; } +#endif /** * Shared memory reduction.