[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Tue Jun 13 07:12:02 UTC 2017


The branch, master has been updated
       via  67095c7 libbreplace: compatibility fix for AIX
      from  60a8ba4 password_hash: Fix the build on FreeBSD

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


- Log -----------------------------------------------------------------
commit 67095c76f64c61a5472c0233e44520ccc4eddbc8
Author: Guillaume Xavier Taillon <gtaillon at ca.ibm.com>
Date:   Mon Feb 22 14:46:24 2016 -0500

    libbreplace: compatibility fix for AIX
    
    Adds macros for preprocessor compares and replaces an incomptatible
      compare with one of the new macros.
    This fixes a comptability bug on AIX.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11621
    Signed-off-by: Guillaume Xavier Taillon <gtaillon at ca.ibm.com>
    Reviewed-by: Björn Jacke <bjacke at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Jun 13 09:11:56 CEST 2017 on sn-devel-144

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

Summary of changes:
 lib/replace/system/time.h | 10 +++++++++-
 lib/util/time.c           |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/time.h b/lib/replace/system/time.h
index b6d2609..00f0d7f 100644
--- a/lib/replace/system/time.h
+++ b/lib/replace/system/time.h
@@ -79,13 +79,21 @@ int rep_utimes(const char *filename, const struct timeval tv[2]);
 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 */
+/* make sure we have a best effort CUSTOM_CLOCK_MONOTONIC we can rely on.
+ *
+ * on AIX the values of CLOCK_* are cast expressions, not integer constants,
+ * this prevents them from being compared against in a preprocessor directive.
+ * The following ...IS_* macros can be used to check which clock is in use.
+ */
 #if defined(CLOCK_MONOTONIC)
 #define CUSTOM_CLOCK_MONOTONIC CLOCK_MONOTONIC
+#define CUSTOM_CLOCK_MONOTONIC_IS_MONOTONIC
 #elif defined(CLOCK_HIGHRES)
 #define CUSTOM_CLOCK_MONOTONIC CLOCK_HIGHRES
+#define CUSTOM_CLOCK_MONOTONIC_IS_HIGHRES
 #else
 #define CUSTOM_CLOCK_MONOTONIC CLOCK_REALTIME
+#define CUSTOM_CLOCK_MONOTONIC_IS_REALTIME
 #endif
 
 #endif
diff --git a/lib/util/time.c b/lib/util/time.c
index 8c01627..8a4d93d 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -60,7 +60,7 @@ _PUBLIC_ void clock_gettime_mono(struct timespec *tp)
 	}
 #endif
 /* then try the  monotonic clock: */
-#if CUSTOM_CLOCK_MONOTONIC != CLOCK_REALTIME
+#ifndef CUSTOM_CLOCK_MONOTONIC_IS_REALTIME
 	if (clock_gettime(CUSTOM_CLOCK_MONOTONIC,tp) == 0) {
 		return;
 	}


-- 
Samba Shared Repository



More information about the samba-cvs mailing list