From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 9 Jun 2015 23:17:37 +0000 (+0200)
Subject: Try to be consistent bewteen xbt_os_thread.h and xbt_os_thread.c
X-Git-Tag: v3_12~624^2~7
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a2d7cc3adbdd23a951262e4bbad302651c0dd817?hp=c7032c15afcb98ff225ee24ddbbcc64482ec7a7c;ds=inline

Try to be consistent bewteen xbt_os_thread.h and xbt_os_thread.c

xbt_os_thread.h was choosing the definition of xbt_os_thread_key_t
based on _XBT_WIN32 but xbt_os_thread.h was choosing the
implementation of the corresponding code based on HAVE_PTHREAD_H. But
it is possible to HAVE_PTHREAD_H on _XBT_WIN32.
---

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index 63819fdc62..2059f2c547 100644
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -21,8 +21,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt,
                                 "Synchronization mechanism (OS-level)");
 
 /* ********************************* PTHREAD IMPLEMENTATION ************************************ */
-#ifdef HAVE_PTHREAD_H
+#ifndef _XBT_WIN32
 
+#include <pthread.h>
 #include <limits.h>
 #include <semaphore.h>