[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Tue Sep 14 12:15:16 MDT 2010


The branch, master has been updated
       via  9c00fb4 libreplace: use CLOCK_HIGHRES when available
      from  33da33c ntlmssp: when pushing an ntlmssp NEGOTIATE_MESSAGE deal with NULL strings.

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


- Log -----------------------------------------------------------------
commit 9c00fb4aa68ac7b044e954906e5ed20e039373a3
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 14 14:08:44 2010 +0200

    libreplace: use CLOCK_HIGHRES when available
    
    in Solaris 8 CLOCK_HIGHRES was the (only) name for CLOCK_MONOTONIC

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

Summary of changes:
 lib/replace/system/time.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/time.h b/lib/replace/system/time.h
index 3605d26..5fce4db 100644
--- a/lib/replace/system/time.h
+++ b/lib/replace/system/time.h
@@ -73,10 +73,12 @@ typedef int clockid_t;
 int rep_clock_gettime(clockid_t clk_id, struct timespec *tp);
 #endif
 /* make sure we have a best effort CUSTOM_CLOCK_MONOTONIC we can rely on */
-#ifndef CLOCK_MONOTONIC
-#define CUSTOM_CLOCK_MONOTONIC CLOCK_REALTIME
-#else
+#if defined(CLOCK_MONOTONIC)
 #define CUSTOM_CLOCK_MONOTONIC CLOCK_MONOTONIC
+#elif defined(CLOCK_HIGHRES)
+#define CUSTOM_CLOCK_MONOTONIC CLOCK_HIGHRES
+#else
+#define CUSTOM_CLOCK_MONOTONIC CLOCK_REALTIME
 #endif
 
 #endif


-- 
Samba Shared Repository


More information about the samba-cvs mailing list