[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc2-91-g43739bd

Karolin Seeger kseeger at samba.org
Fri Jun 27 13:53:36 GMT 2008


The branch, v3-2-stable has been updated
       via  43739bd295cee3bb6b46c53b50630710ca977bf7 (commit)
      from  b72faab5010486265ac644dcbf4a974ee0266b23 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 43739bd295cee3bb6b46c53b50630710ca977bf7
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Jun 27 15:51:35 2008 +0200

    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)

-----------------------------------------------------------------------

Summary of changes:
 source/include/debug.h     |    8 ++++++++
 source/lib/talloc/talloc.c |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/debug.h b/source/include/debug.h
index d8dafcb..d171632 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 d535c3d..99210f3 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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list