diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 14:07:51 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 14:07:51 +0200 |
| commit | 3189d141522d7d710fa8c7f58e92bffd854088ce (patch) | |
| tree | b859f492cbcd38c57d5335e2cddf6557f04b22bf /lib/util/memory.h | |
| parent | dc5dc3b469decd00609013da578b4a2c83bfe5fc (diff) | |
| download | samba-3189d141522d7d710fa8c7f58e92bffd854088ce.tar.gz samba-3189d141522d7d710fa8c7f58e92bffd854088ce.tar.bz2 samba-3189d141522d7d710fa8c7f58e92bffd854088ce.zip | |
Use the new memory macro file from Samba 3.
Diffstat (limited to 'lib/util/memory.h')
| -rw-r--r-- | lib/util/memory.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/util/memory.h b/lib/util/memory.h index 62686df40d..29dd75060f 100644 --- a/lib/util/memory.h +++ b/lib/util/memory.h @@ -40,12 +40,20 @@ /** * Allocate an array of elements of one data type. Does type-checking. */ +#if _SAMBA_BUILD_ == 3 +#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count, false) +#else #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count) +#endif /** * Resize an array of elements of one data type. Does type-checking. */ +#if _SAMBA_BUILD_ == 3 +#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count, false) +#else #define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count) +#endif /** * zero a structure |