diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-06-27 15:51:35 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-06-27 15:55:40 +0200 |
| commit | 43739bd295cee3bb6b46c53b50630710ca977bf7 (patch) | |
| tree | 63a73016ab740dc720e636cdea11977a47976a5a | |
| parent | b72faab5010486265ac644dcbf4a974ee0266b23 (diff) | |
| download | samba-43739bd295cee3bb6b46c53b50630710ca977bf7.tar.gz | |
Fix warnings on SuSE 9.0.
The macros "[un]likely" are already defined on SuSE 9.0.
Patch from Volker.
(cherry picked from commit 30d181c92463aecd6e649330d3645d86d5a17e43)
(cherry picked from commit 33eb39de7b0e88bf51430d645be26d47effaa98f)
| -rw-r--r-- | source/include/debug.h | 8 | ||||
| -rw-r--r-- | source/lib/talloc/talloc.c | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/source/include/debug.h b/source/include/debug.h index d8dafcbd457..d1716320b3b 100644 --- a/source/include/debug.h +++ b/source/include/debug.h @@ -169,12 +169,20 @@ extern bool *DEBUGLEVEL_CLASS_ISSET; #if (__GNUC__ >= 3) /* the strange !! is to ensure that __builtin_expect() takes either 0 or 1 as its first argument */ +#ifndef likely #define likely(x) __builtin_expect(!!(x), 1) +#endif +#ifndef unlikely #define unlikely(x) __builtin_expect(!!(x), 0) +#endif #else +#ifndef likely #define likely(x) (x) +#endif +#ifndef unlikely #define unlikely(x) (x) #endif +#endif #define CHECK_DEBUGLVL( level ) \ ( ((level) <= MAX_DEBUG_LEVEL) && \ diff --git a/source/lib/talloc/talloc.c b/source/lib/talloc/talloc.c index d535c3d7845..99210f3e1bd 100644 --- a/source/lib/talloc/talloc.c +++ b/source/lib/talloc/talloc.c @@ -82,12 +82,20 @@ #if (__GNUC__ >= 3) /* the strange !! is to ensure that __builtin_expect() takes either 0 or 1 as its first argument */ +#ifndef likely #define likely(x) __builtin_expect(!!(x), 1) +#endif +#ifndef unlikely #define unlikely(x) __builtin_expect(!!(x), 0) +#endif #else +#ifndef likely #define likely(x) (x) +#endif +#ifndef unlikely #define unlikely(x) (x) #endif +#endif /* this null_context is only used if talloc_enable_leak_report() or talloc_enable_leak_report_full() is called, otherwise it remains |