summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-08-24 21:49:10 +0000
committerJeremy Allison <jra@samba.org>1998-08-24 21:49:10 +0000
commit8afc9c80ac11649f06e5517d819dbf201c941acb (patch)
tree99823c267e34902aae622643b2e2fb412d5f846c /source3/include
parent0e877bd53bcffcaeab738610ca64c685c99f8263 (diff)
downloadsamba-8afc9c80ac11649f06e5517d819dbf201c941acb.tar.gz
samba-8afc9c80ac11649f06e5517d819dbf201c941acb.tar.bz2
samba-8afc9c80ac11649f06e5517d819dbf201c941acb.zip
Changed ASSERT macros to SMB_ASSERT macros as some systems already
have an ASSERT macro defined. Jeremy. (This used to be commit dbe6ad014a8b5dcbf17d7cd9865650c2e040d666)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9dc1ff5f38..0a49b72a27 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1561,10 +1561,10 @@ extern int unix_ERR_code;
/* useful macros */
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
-#define ASSERT(b) ((b)?0: \
+#define SMB_ASSERT(b) ((b)?(void)0: \
(DEBUG(0,("PANIC: assert failed at %s(%d)\n", \
__FILE__, __LINE__)), smb_panic("assert failed")))
-#define ASSERT_ARRAY(a,n) ASSERT((sizeof(a)/sizeof((a)[0])) >= (n))
+#define SMB_ASSERT_ARRAY(a,n) SMB_ASSERT((sizeof(a)/sizeof((a)[0])) >= (n))
#endif /* _SMB_H */