[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  d45f901 s4/ldb: fix standalone build
      from  5568ced s3-ctdb: ctdbd_init_connection() is static to this file.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d45f901b9304977f7125fefcfc889076471442b4
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Sep 1 11:22:09 2010 +0200

    s4/ldb: fix standalone build

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/tools/ldbtest.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index a885b80..94dd2c6 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -45,12 +45,16 @@ static struct ldb_cmdline *options;
 
 static void _start_timer(void)
 {
-	clock_gettime_mono(&tp1);
+	if (clock_gettime(CUSTOM_CLOCK_MONOTONIC, &tp1) != 0) {
+		clock_gettime(CLOCK_REALTIME, &tp1);
+	}
 }
 
 static double _end_timer(void)
 {
-	clock_gettime_mono(&tp2);
+	if (clock_gettime(CUSTOM_CLOCK_MONOTONIC, &tp2) != 0) {
+		clock_gettime(CLOCK_REALTIME, &tp2);
+	}
 	return((tp2.tv_sec - tp1.tv_sec) + 
 	       (tp2.tv_nsec - tp1.tv_nsec)*1.0e-9);
 }


-- 
Samba Shared Repository