Fix warnings on SuSE 9.0.

[abartlet/samba.git/.git] / source3 / lib / talloc / talloc.c

diff --git a/source3/lib/talloc/talloc.c b/source3/lib/talloc/talloc.c
index d535c3d78458296e456524eb2dfacb183195214b..99210f3e1bd6362b61561a776d12118499326632 100644 (file)
--- a/source3/lib/talloc/talloc.c
+++ b/source3/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