From a2d7cc3adbdd23a951262e4bbad302651c0dd817 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 10 Jun 2015 01:17:37 +0200
Subject: [PATCH] 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.
---
 src/xbt/xbt_os_thread.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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>
 
-- 
2.20.1