From: Mark Andrews <marka@isc.org>
Date: Thu, 30 Jan 2020 06:27:08 +0000 (+1100)
Subject: simplify ISC_LIKELY/ISC_UNLIKELY for CPPCHECK
X-Git-Tag: v9.14.11~20^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=123371e1e715813fb78a9746243f62fd72e8fd2d;p=thirdparty%2Fbind9.git

simplify ISC_LIKELY/ISC_UNLIKELY for CPPCHECK

(cherry picked from commit 6c2e138d7aac0e7487b2ba2df6796ba64ccfc26b)
---

diff --git a/lib/isc/include/isc/likely.h b/lib/isc/include/isc/likely.h
index 8cc5b2eb4b7..6f65e1b27df 100644
--- a/lib/isc/include/isc/likely.h
+++ b/lib/isc/include/isc/likely.h
@@ -15,6 +15,10 @@
 /*%
  * Performance
  */
+#ifdef CPPCHECK
+#define ISC_LIKELY(x)            (x)
+#define ISC_UNLIKELY(x)          (x)
+#else
 #ifdef HAVE_BUILTIN_EXPECT
 #define ISC_LIKELY(x)            __builtin_expect(!!(x), 1)
 #define ISC_UNLIKELY(x)          __builtin_expect(!!(x), 0)
@@ -22,5 +26,6 @@
 #define ISC_LIKELY(x)            (x)
 #define ISC_UNLIKELY(x)          (x)
 #endif
+#endif
 
 #endif /* ISC_LIKELY_H */