[SCM] Samba Shared Repository - branch master updated

Martin Schwenke martins at samba.org
Thu Jan 8 13:42:03 MST 2015


The branch, master has been updated
       via  87c1765 lib/util: Avoid collision which alread defined consumer DEBUG macro.
      from  8d4cac1 s4:torture:vfs_fruit: fix model name check

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 87c176563baea3458c5322f1e3dfae6cf074b4b4
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jan 8 10:24:36 2015 +0100

    lib/util: Avoid collision which alread defined consumer DEBUG macro.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11033
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Thu Jan  8 21:41:30 CET 2015 on sn-devel-104

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

Summary of changes:
 lib/util/debug.h | 6 +++---
 lib/util/fault.h | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/debug.h b/lib/util/debug.h
index 67d122f..a8a0d69 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -20,8 +20,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DEBUG_H
-#define _DEBUG_H
+#ifndef _SAMBA_DEBUG_H
+#define _SAMBA_DEBUG_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -263,4 +263,4 @@ typedef void (*debug_callback_fn)(void *private_ptr, int level, const char *msg)
  */
 void debug_set_callback(void *private_ptr, debug_callback_fn fn);
 
-#endif
+#endif /* _SAMBA_DEBUG_H */
diff --git a/lib/util/fault.h b/lib/util/fault.h
index 98a24a3..aa10a71 100644
--- a/lib/util/fault.h
+++ b/lib/util/fault.h
@@ -24,11 +24,15 @@
 #include <sys/types.h>
 
 #include "attr.h"
+
+#ifndef DEBUG
 #include "debug.h"
+#endif /* DEBUG */
 
 /**
  * assert macros
  */
+#ifdef _SAMBA_DEBUG_H
 #define SMB_ASSERT(b) \
 do { \
 	if (!(b)) { \
@@ -37,6 +41,7 @@ do { \
 		smb_panic("assert failed: " #b); \
 	} \
 } while(0)
+#endif /* _SAMBA_DEBUG_H */
 
 extern const char *panic_action;
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list