summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-11-09 02:12:09 +0000
committerLennart Poettering <lennart@poettering.net>2007-11-09 02:12:09 +0000
commit3c17c7d44284a739ec1453a7470333c73f072eeb (patch)
tree73cee38ef228fe61e4d820f43c869fc6e4b9fa95
parentecf349dc6cdb6737f3854c5c4678d336dcf10938 (diff)
fix CLAMP_LIKELY/UNLIKELY definition
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2036 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/gccmacro.h4
-rw-r--r--src/pulsecore/macro.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pulsecore/gccmacro.h b/src/pulsecore/gccmacro.h
index ecdc0578..f1646653 100644
--- a/src/pulsecore/gccmacro.h
+++ b/src/pulsecore/gccmacro.h
@@ -79,8 +79,8 @@
#ifndef PA_LIKELY
#ifdef __GNUC__
-#define PA_LIKELY(x) __builtin_expect((x),1)
-#define PA_UNLIKELY(x) __builtin_expect((x),0)
+#define PA_LIKELY(x) (__builtin_expect((x),1))
+#define PA_UNLIKELY(x) (__builtin_expect((x),0))
#else
#define PA_LIKELY(x) (x)
#define PA_UNLIKELY(x) (x)
diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h
index 548e4ed9..98e023aa 100644
--- a/src/pulsecore/macro.h
+++ b/src/pulsecore/macro.h
@@ -77,8 +77,8 @@ static inline size_t pa_page_align(size_t l) {
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
#endif
-#define PA_CLAMP_LIKELY(x, low, high) (PA_LIKELY((x) > (high)) ? (high) : PA_LIKELY(((x) < (low)) ? (low) : (x)))
-#define PA_CLAMP_UNLIKELY(x, low, high) (PA_UNLIKELY((x) > (high)) ? (high) : PA_UNLIKELY(((x) < (low)) ? (low) : (x)))
+#define PA_CLAMP_LIKELY(x, low, high) (PA_LIKELY((x) > (high)) ? (high) : (PA_LIKELY((x)<(low)) ? (low) : (x)))
+#define PA_CLAMP_UNLIKELY(x, low, high) (PA_UNLIKELY((x) > (high)) ? (high) : (PA_UNLIKELY((x) < (low)) ? (low) : (x)))
/* This type is not intended to be used in exported APIs! Use classic "int" there! */
#ifdef HAVE_STD_BOOL