diff options
author | Andrew Tridgell <tridge@samba.org> | 1997-12-04 07:48:06 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1997-12-04 07:48:06 +0000 |
commit | 500069329a878cdf2173e24cf2419991ee6ce323 (patch) | |
tree | ef0946f23c27cacbecc2bb6a4b88f5bbec63b3b9 /source3/include/includes.h | |
parent | 28f37efd349a3199954060700b3239aed4f3c9e2 (diff) | |
download | samba-500069329a878cdf2173e24cf2419991ee6ce323.tar.gz samba-500069329a878cdf2173e24cf2419991ee6ce323.tar.bz2 samba-500069329a878cdf2173e24cf2419991ee6ce323.zip |
added optonal MEM_MAN code
(This used to be commit b524c8da5141e3e030e14b3a0167fa5c7ae91396)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r-- | source3/include/includes.h | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 5bfe024145..6c2b676b31 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1285,51 +1285,8 @@ extern int errno; #define strcpy(dest,src) StrCpy(dest,src) #endif - -/* possibly wrap the malloc calls */ -#if WRAP_MALLOC - -/* undo the old malloc def if necessary */ -#ifdef malloc -#define xx_old_malloc malloc -#undef malloc -#endif - -#define malloc(size) malloc_wrapped(size,__FILE__,__LINE__) - -/* undo the old realloc def if necessary */ -#ifdef realloc -#define xx_old_realloc realloc -#undef realloc -#endif - -#define realloc(ptr,size) realloc_wrapped(ptr,size,__FILE__,__LINE__) - -/* undo the old free def if necessary */ -#ifdef free -#define xx_old_free free -#undef free -#endif - -#define free(ptr) free_wrapped(ptr,__FILE__,__LINE__) - -/* and the malloc prototypes */ -void *malloc_wrapped(int,char *,int); -void *realloc_wrapped(void *,int,char *,int); -void free_wrapped(void *,char *,int); - -#endif - - -#if WRAP_MEMCPY -/* undo the old memcpy def if necessary */ -#ifdef memcpy -#define xx_old_memcpy memcpy -#undef memcpy -#endif - -#define memcpy(d,s,l) memcpy_wrapped(d,s,l,__FILE__,__LINE__) -void *memcpy_wrapped(void *d,void *s,int l,char *fname,int line); +#if MEM_MAN +#include "mem_man/mem_man.h" #endif #endif |