X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/03182900f42e677d326f17bb723c42913b99d1ae..5fc72d28104dca5e9f2fb0d2bb047c7277a7999f:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 9adeeac59e..e447ed3e98 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -18,6 +18,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#include <malloc.h>
 #else
 #include <sys/mman.h>
 #endif
@@ -27,10 +28,6 @@
 #define _aligned_free  __mingw_aligned_free 
 #endif //MINGW
 
-#if defined(_XBT_WIN32)
-#include <malloc.h>
-#endif
-
 #ifdef HAVE_VALGRIND_VALGRIND_H
 # include <valgrind/valgrind.h>
 #endif
@@ -45,7 +42,7 @@ int smx_context_stack_size_was_set = 0;
 int smx_context_guard_size;
 int smx_context_guard_size_was_set = 0;
 #ifdef HAVE_THREAD_LOCAL_STORAGE
-static __thread smx_context_t smx_current_context_parallel;
+static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel;
 #else
 static xbt_os_thread_key_t smx_current_context_key = 0;
 #endif