summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-23 01:59:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:19:16 -0500
commit45ca27699c018423364a1307b241d6034de1332d (patch)
treeb9696dc1badc8f3c46884344395fb7c85b182bfe
parentf753f43d818ec36c19c1c72509a0380cc8b4bea3 (diff)
downloadsamba-45ca27699c018423364a1307b241d6034de1332d.tar.gz
samba-45ca27699c018423364a1307b241d6034de1332d.tar.bz2
samba-45ca27699c018423364a1307b241d6034de1332d.zip
r18834: get the log context code right
(This used to be commit b6bb5d7b772467042cee6ea372119781c42b91c1)
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index 654afea2f1..b28bf77450 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
@@ -122,11 +122,11 @@ struct tdb_context *ltdb_wrap_open(TALLOC_CTX *mem_ctx,
{
struct ltdb_wrap *w;
struct stat st;
-#if (_SAMBA_BUILD_ <= 3)
+#if defined(_SAMBA_BUILD_) && (_SAMBA_BUILD_ <= 3)
tdb_log_func log_ctx_p = ltdb_log_fn;
#else
struct tdb_logging_context log_ctx;
- struct tdb_logging_context log_ctx_p = &log_ctx;
+ const struct tdb_logging_context *log_ctx_p = &log_ctx;
log_ctx.log_fn = ltdb_log_fn;
log_ctx.log_private = ldb;
#endif