diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:14:43 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:14:43 +0100 |
| commit | 9de80e7abceb3c64c658f2aeeb5ca68e980e89c8 (patch) | |
| tree | f0e3ad8b63afc0bf0adf7a2e8a2a5cbbceadf09b /source3/include | |
| parent | 72af9b01dc7ee00d79908760af6051f8794fa2b8 (diff) | |
| download | samba-9de80e7abceb3c64c658f2aeeb5ca68e980e89c8.tar.gz samba-9de80e7abceb3c64c658f2aeeb5ca68e980e89c8.tar.bz2 samba-9de80e7abceb3c64c658f2aeeb5ca68e980e89c8.zip | |
Samba3: Include util.h header file rather than having custom prototypes.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 24e33c1720..73600e379b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -572,6 +572,7 @@ extern void *cmdline_lp_ctx; struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); /* Lists, trees, caching, database... */ +#include "../lib/util/util.h" #include "../lib/util/xfile.h" #include "../lib/util/memory.h" #include "../lib/util/attr.h" @@ -619,6 +620,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "msdfs.h" #include "rap.h" #include "../lib/crypto/md5.h" +#include "../lib/crypto/md4.h" #include "../lib/crypto/arcfour.h" #include "../lib/crypto/crc32.h" #include "../lib/crypto/hmacmd5.h" diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index d2e0aa95ac..668dc186d3 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -45,17 +45,7 @@ #define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0) #endif -/* assert macros */ -#ifdef DEVELOPER -#define SMB_ASSERT(b) ( (b) ? (void)0 : \ - (DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \ - __FILE__, __LINE__, #b)), smb_panic("assert failed: " #b))) -#else -/* redefine the assert macro for non-developer builds */ -#define SMB_ASSERT(b) ( (b) ? (void)0 : \ - (DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \ - __FILE__, __LINE__, #b)))) -#endif + #define SMB_WARN(condition, message) \ ((condition) ? (void)0 : \ |