From: Martin Quinson Date: Fri, 4 Mar 2016 23:19:30 +0000 (+0100) Subject: fix build on mac X-Git-Tag: v3_13~557 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f3cd23afe615d7dbf0cd36db5ed9ed604e61a957 fix build on mac --- diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 6acbaeb184..e530de4399 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -329,11 +329,13 @@ void xbt_os_mutex_acquire(xbt_os_mutex_t mutex) void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) { + int errcode; + if (delay < 0) { xbt_os_mutex_acquire(mutex); } else if (delay == 0) { - int errcode = pthread_mutex_trylock(&(mutex->m)); + errcode = pthread_mutex_trylock(&(mutex->m)); switch (errcode) { case 0: @@ -359,7 +361,7 @@ void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) int errcode = pthread_mutex_timedlock(&(mutex->m), &ts_end); -#else /* Well, let's reimplement it since those lazy libc dudes didn't */ +#else /* reimplement it since those lazy libc dudes didn't (Mac OSX, hu?) */ double start = xbt_os_time(); do { errcode = pthread_mutex_trylock(&(mutex->m));