From e08943f8d855b85765615b2a231fb65d5788a2a6 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Fri, 27 Jun 2008 15:51:35 +0200
Subject: Fix warnings on SuSE 9.0.

The macros "[un]likely" are already defined on SuSE 9.0.
Patch from Volker.
(This used to be commit 30d181c92463aecd6e649330d3645d86d5a17e43)
---
 source3/include/debug.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source3/include')

diff --git a/source3/include/debug.h b/source3/include/debug.h
index d8dafcbd45..d1716320b3 100644
--- a/source3/include/debug.h
+++ b/source3/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) && \
-- 
cgit