From 5ba898b738e1fc085bd6c29548edd8a468bf83bd Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 9 Dec 2013 19:02:32 +0100 Subject: [PATCH] cppcheck: don't use likely/unlikely when -DCPPCHECK is passed to the checker --- src/util-optimize.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util-optimize.h b/src/util-optimize.h index 134ee9d037..bde35ddd81 100644 --- a/src/util-optimize.h +++ b/src/util-optimize.h @@ -24,12 +24,17 @@ * \author Victor Julien */ +#if CPPCHECK==1 +#define likely +#define unlikely +#else #ifndef likely #define likely(expr) __builtin_expect(!!(expr), 1) #endif #ifndef unlikely #define unlikely(expr) __builtin_expect(!!(expr), 0) #endif +#endif /** from http://en.wikipedia.org/wiki/Memory_ordering *