diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-20 13:22:08 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-20 13:22:08 +1100 |
| commit | 27c6eca04c4c1bb40ff36f3a08748e2f45770aa8 (patch) | |
| tree | f87d3e6ca4958e9b9102ca8ee5fb3e5f0917570e /source3/libaddns | |
| parent | 1f25b71d199a072f5ee1bdd8786e5c1c157f5888 (diff) | |
| parent | 5fe2b28f45289dc5578cdd536600f0d30a14d820 (diff) | |
| download | samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.gz samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.bz2 samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source3/libaddns')
| -rw-r--r-- | source3/libaddns/dns.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h index 57a9b6a002..a04a13bfd9 100644 --- a/source3/libaddns/dns.h +++ b/source3/libaddns/dns.h @@ -133,7 +133,9 @@ void *talloc_zeronull(const void *context, size_t size, const char *name); #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__) #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type) #define talloc_destroy(ctx) talloc_free(ctx) +#ifndef TALLOC_FREE #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) +#endif /******************************************************************* Type definitions for int16, int32, uint16 and uint32. Needed |