From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 9 Jun 2015 23:13:09 +0000 (+0200)
Subject: Remove an explicit declaration of pthread_mutex_timedlock()
X-Git-Tag: v3_12~624^2~8
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c7032c15afcb98ff225ee24ddbbcc64482ec7a7c?ds=sidebyside

Remove an explicit declaration of pthread_mutex_timedlock()

"redefine the function header since we fail to get this from system
headers on amd (at least)"

I guess, this should be fine now. It causes issues with Windows target
because we need to declare it with dllimport.
---

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index b97d90e675..63819fdc62 100644
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -31,13 +31,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt,
 #include <sched.h>
 #endif
 
-#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
 static int next_sem_ID = 0;