From d079b4863b2e0c758e81d117df4cdc967c342c22 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 16 Sep 2007 21:54:12 +0000 Subject: [PATCH] properly define MAX/MIN macros git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1829 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/pulsecore/macro.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h index c46ae52..ec45154 100644 --- a/src/pulsecore/macro.h +++ b/src/pulsecore/macro.h @@ -64,8 +64,13 @@ static inline size_t pa_page_align(size_t l) { #define PA_ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0])) -#define SA_MAX(a, b) ((a) > (b) ? (a) : (b)) -#define SA_MIN(a, b) ((a) < (b) ? (a) : (b)) +#ifndef MAX +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif + +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif #ifdef __GNUC__ #define PA_PRETTY_FUNCTION __PRETTY_FUNCTION__ -- 2.7.4