fix CLAMP_LIKELY/UNLIKELY definition

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2036 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/pulsecore/gccmacro.h b/src/pulsecore/gccmacro.h
index ecdc05784d0fe811cad542175eadc2f3c135dc89..f16466533248dedfd75ada362d709243f15f191a 100644 (file)
--- 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 548e4ed90cd0757981294420f14b0e36b4c7cc32..98e023aa94bac1162c720cee4ab82b983106c3d3 100644 (file)
--- 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