diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2023-02-17 20:56:48 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-23 12:54:56 +0100 |
| commit | 6a72124df9cfc4ec7dabddfae5b3ab63a1069b87 (patch) | |
| tree | fafd604e588389250d17ffe0317a83473eda7845 /nhrpd | |
| parent | Merge pull request #13078 from opensourcerouting/fix/set_distance_zero (diff) | |
| download | frr-6a72124df9cfc4ec7dabddfae5b3ab63a1069b87.tar.xz frr-6a72124df9cfc4ec7dabddfae5b3ab63a1069b87.zip | |
babeld, lib, nhrpd: Add likely and unlikely macros
We have 2 competing versions of likely and unlikely
in babeld and nhrpd. Standardize onto lower case
versions and consolidate in the code.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'nhrpd')
| -rw-r--r-- | nhrpd/debug.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nhrpd/debug.h b/nhrpd/debug.h index e9428fa90..f2c7022ad 100644 --- a/nhrpd/debug.h +++ b/nhrpd/debug.h @@ -1,13 +1,5 @@ #include "log.h" -#if defined(__GNUC__) && (__GNUC__ >= 3) -#define likely(_x) __builtin_expect(!!(_x), 1) -#define unlikely(_x) __builtin_expect(!!(_x), 0) -#else -#define likely(_x) !!(_x) -#define unlikely(_x) !!(_x) -#endif - #define NHRP_DEBUG_COMMON (1 << 0) #define NHRP_DEBUG_KERNEL (1 << 1) #define NHRP_DEBUG_IF (1 << 2) |