projects
/
profile
/
ivi
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
87795b0
)
properly define MAX/MIN macros
author
Lennart Poettering
<lennart@poettering.net>
Sun, 16 Sep 2007 21:54:12 +0000
(21:54 +0000)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 16 Sep 2007 21:54:12 +0000
(21:54 +0000)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1829
fefdeb5f
-60dc-0310-8127-
8f9354f1896f
src/pulsecore/macro.h
patch
|
blob
|
history
diff --git
a/src/pulsecore/macro.h
b/src/pulsecore/macro.h
index
c46ae52
..
ec45154
100644
(file)
--- 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__