summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-03 06:39:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:34 -0500
commit1429ed54f14055a1a9399452cb6cfc94f9451cf5 (patch)
tree31fe5adaed9e5afe6f886a919078053fa34e7b4f /source4/lib/ldb/include
parent15b9736ed30d8e947dbe2513dd9cf27d5b3761af (diff)
downloadsamba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.tar.gz
samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.tar.bz2
samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.zip
r2792: got rid of talloc_ldb_alloc() and instead created talloc_realloc_fn(),
so talloc now doesn't contain any ldb specific functions. allow NULL to be passed to a couple more talloc() functions (This used to be commit 1246f80d806fb5f63cfbf3879de6d546384552a8)
Diffstat (limited to 'source4/lib/ldb/include')
-rw-r--r--source4/lib/ldb/include/ldb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 241f186991..4b1401f673 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -145,7 +145,7 @@ struct ldb_backend_ops {
for pool allocators
*/
struct ldb_alloc_ops {
- void *(*alloc)(void *context, void *ptr, size_t size);
+ void *(*alloc)(const void *context, void *ptr, size_t size);
void *context;
};
@@ -320,7 +320,7 @@ const char *ldb_msg_find_string(const struct ldb_message *msg,
which often take a context argument
*/
int ldb_set_alloc(struct ldb_context *ldb,
- void *(*alloc)(void *context, void *ptr, size_t size),
+ void *(*alloc)(const void *context, void *ptr, size_t size),
void *context);
/*