mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-14 16:29:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

[BUILD] silent a warning in unlikely() with gcc 4.x

Browse Source 
The unlikely() implementation for gcc 4.x spits out a warning
when a pointer is passed. Add a cast to unsigned long.
(cherry picked from commit 75875a7c8c)
This commit is contained in:
Willy Tarreau
2008-07-06 15:18:50 +02:00
parent 66c9f287c2
commit 3ff2c1d9b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/ebtree.h
View File

@@ -322,7 +322,7 @@ static inline int fls64(unsigned long long x)
* only work with ints and booleans though.
*/
#define likely(x) (x)
#define unlikely(x) (__builtin_expect((x), 0))
#define unlikely(x) (__builtin_expect((unsigned long)(x), 0))
#endif
#endif

2
include/common/standard.h
View File

@@ -61,7 +61,7 @@
* only work with ints and booleans though.
*/
#define likely(x) (x)
#define unlikely(x) (__builtin_expect((x), 0))
#define unlikely(x) (__builtin_expect((unsigned long)(x), 0))
#endif
#endif