diff options
| author | Andreas Schneider <asn@samba.org> | 2015-01-08 10:24:36 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-01-15 13:55:09 +0100 |
| commit | ec8043974019a9b2d9b507c2cf1f3611b66e7605 (patch) | |
| tree | 373a3ab140dea9987e119969f6ccb4b64b38d777 | |
| parent | a756e6551c87f3457fbac77a651075dab58c503a (diff) | |
| download | samba-ec8043974019a9b2d9b507c2cf1f3611b66e7605.tar.gz | |
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@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit 87c176563baea3458c5322f1e3dfae6cf074b4b4)
Signed-off-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | lib/util/debug.h | 6 | ||||
| -rw-r--r-- | lib/util/fault.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/util/debug.h b/lib/util/debug.h index 27c319b760d..fa07d4088bd 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> @@ -262,4 +262,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 98a24a34709..aa10a71282e 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; |