diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-02 07:47:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:07:55 -0500 |
| commit | 65f96eba32b93ced0717c2639007bba59da55fa4 (patch) | |
| tree | dc691fb43c8d1d0261497e53502a0e0b93ffd31c /source4/include/includes.h | |
| parent | 68460ee88caadefea2adbd4f24755e3dd1cb0a47 (diff) | |
| download | samba-65f96eba32b93ced0717c2639007bba59da55fa4.tar.gz samba-65f96eba32b93ced0717c2639007bba59da55fa4.tar.bz2 samba-65f96eba32b93ced0717c2639007bba59da55fa4.zip | |
r4473: - moved talloc into its own lib/talloc/ area
- added gcov flags to Makefile.talloc
- expanded talloc testsuite to add a test for realloc with a child ptr
- fixed a bug in talloc_realloc() with realloc of a ptr that has child ptrs
(This used to be commit 98b5f73c1ba34d7576c5995069b485c1c5ede324)
Diffstat (limited to 'source4/include/includes.h')
| -rw-r--r-- | source4/include/includes.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index ad24ff676d..2666d59f89 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -154,7 +154,7 @@ extern int errno; /* Lists, trees, caching, database... */ #include "version.h" #include "xfile.h" -#include "talloc.h" +#include "lib/talloc/talloc.h" #include "nt_status.h" #include "structs.h" #include "lib/tdb/include/tdb.h" @@ -291,8 +291,10 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #define strlen(x) valgrind_strlen(x) #endif +#if 0 +/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */ #define TALLOC_ABORT(reason) smb_panic(reason) - +#endif /* this is a warning hack. The idea is to use this everywhere that we |