svn commit: samba r18832 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .

[tridge at samba.org]

Author: tridge
Date: 2006-09-22 23:25:16 +0000 (Fri, 22 Sep 2006)
New Revision: 18832

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18832

Log:

fixed standalone build

Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c	2006-09-22 23:22:39 UTC (rev 18831)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c	2006-09-22 23:25:16 UTC (rev 18832)
@@ -58,7 +58,22 @@
 	return 0;
 }				 
 
-#if (_SAMBA_BUILD_ >= 4)
+#if defined(_SAMBA_BUILD_) && (_SAMBA_BUILD_ <= 3)
+static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
+static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...)
+{
+	/* until we merge the tdb debug changes into samba3, we don't know 
+	   how serious the error is, and we can't go via the ldb loggin code */
+	va_list ap;
+	const char *name = tdb_name(tdb);
+	char *message; 
+	va_start(ap, fmt);
+	message = talloc_vasprintf(NULL, fmt, ap);
+	va_end(ap);
+	DEBUG(3, ("ltdb: tdb(%s): %s", name, message));
+	talloc_free(message);
+}
+#else
 static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
 static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...)
 {
@@ -91,21 +106,6 @@
 	ldb_debug(ldb, ldb_level, "ltdb: tdb(%s): %s", name, message);
 	talloc_free(message);
 }
-#else
-static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
-static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...)
-{
-	/* until we merge the tdb debug changes into samba3, we don't know 
-	   how serious the error is, and we can't go via the ldb loggin code */
-	va_list ap;
-	const char *name = tdb_name(tdb);
-	char *message; 
-	va_start(ap, fmt);
-	message = talloc_vasprintf(NULL, fmt, ap);
-	va_end(ap);
-	DEBUG(3, ("ltdb: tdb(%s): %s", name, message));
-	talloc_free(message);
-}
 #endif
 
 /*
@@ -122,13 +122,13 @@
 {
 	struct ltdb_wrap *w;
 	struct stat st;
-#if (_SAMBA_BUILD_ >= 4)
+#if (_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;
 	log_ctx.log_fn = ltdb_log_fn;
 	log_ctx.log_private = ldb;
-#else
-	tdb_log_func log_ctx_p = ltdb_log_fn;
 #endif
 
 	if (stat(path, &st) == 0) {