cppcheck: don't use likely/unlikely when -DCPPCHECK is passed to the checker

diff --git a/src/util-optimize.h b/src/util-optimize.h
index 134ee9d03721fb5da267fa3a975351430ee33c04..bde35ddd810eacc6521725283291a754709ec545 100644 (file)
--- a/src/util-optimize.h
+++ b/src/util-optimize.h
@@ -24,12 +24,17 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
+#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
  *