The following changes since commit b4c1fb368f9863449e4c0312df845b58f8b67717: mutex: more clock fixes (2012-02-16 22:22:46 +0100) are available in the git repository at: git://git.kernel.dk/fio.git master Jens Axboe (2): mutex: guard pthread_condattr_setclock() by defined "have ifdef" mac: doesn't have pthread_condattr_setclock() mutex.c | 2 +- os/os-mac.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) --- Diff of recent changes: diff --git a/mutex.c b/mutex.c index ff6ec73..94e1188 100644 --- a/mutex.c +++ b/mutex.c @@ -64,7 +64,7 @@ struct fio_mutex *fio_mutex_init(int value) #ifdef FIO_HAVE_PSHARED_MUTEX pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED); #endif -#ifdef FIO_HAVE_CLOCK_MONOTONIC +#ifdef FIO_HAVE_PTHREAD_CONDATTR_SETCLOCK pthread_condattr_setclock(&cond, fio_clk_id); #endif pthread_cond_init(&mutex->cond, &cond); diff --git a/os/os-mac.h b/os/os-mac.h index e4c2bc8..aec30f9 100644 --- a/os/os-mac.h +++ b/os/os-mac.h @@ -29,7 +29,6 @@ #define FIO_USE_GENERIC_RAND #define FIO_HAVE_GETTID #define FIO_HAVE_CHARDEV_SIZE -#define FIO_HAVE_PTHREAD_CONDATTR_SETCLOCK #define OS_MAP_ANON MAP_ANON -- To unsubscribe from this list: send the line "unsubscribe fio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html