From: mquinson Date: Sat, 27 Oct 2007 14:47:29 +0000 (+0000) Subject: Let's be brutal: copy the pthread_mutex_timedlock prototype since I fail to get this... X-Git-Tag: v3.3~885 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/558a3e70545cb12442d4fcaab591667049c3d458 Let's be brutal: copy the pthread_mutex_timedlock prototype since I fail to get this from the system headers on amd64 git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4917 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 63f7bb020a..c7e40d3542 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -10,11 +10,6 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#ifdef HAVE_PTHREAD_H -/* XOPEN_SOURCE is needed to get sem_timedwait (on amd64 at least). Declare it before everything else to play safe. */ -#define _XOPEN_SOURCE 600 -#endif - #include "xbt/sysdep.h" #include "xbt/ex.h" #include "xbt/ex_interface.h" /* We play crude games with exceptions */ @@ -28,15 +23,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os,xbt,"Synchronization mechanism (OS-l /* ********************************* PTHREAD IMPLEMENTATION ************************************ */ #ifdef HAVE_PTHREAD_H -/* XOPEN_SOURCE is needed to get sem_timedwait (on amd64 at least) according to the man page, - but the headers seem to follow __USE_XOPEN2K. - So let's get safe and declare both before loading headers. */ -#define _XOPEN_SOURCE 600 -#include - #include #include +#ifdef HAVE_MUTEX_TIMEDLOCK +/* redefine the function header since we fail to get this from system headers on amd (at least) */ +int pthread_mutex_timedlock(pthread_mutex_t *mutex, + const struct timespec *abs_timeout); +#endif + /* use named sempahore when sem_init() does not work */ #ifndef HAVE_SEM_INIT