diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-09-16 21:54:12 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-09-16 21:54:12 +0000 |
| commit | d079b4863b2e0c758e81d117df4cdc967c342c22 (patch) | |
| tree | 255a30ccf64d9da7f3cdf11eb922d4ba9bc9b595 | |
| parent | 87795b09737c0428bec4d1fcec23bfa1df5f92be (diff) | |
properly define MAX/MIN macros
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1829 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/pulsecore/macro.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h index c46ae524..ec451547 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__ |