A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Lua] Patched lua_platf.c for Lua 5.3.1
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
9adeeac
..
e447ed3
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-18,6
+18,7
@@
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
+#include <malloc.h>
#else
#include <sys/mman.h>
#endif
#else
#include <sys/mman.h>
#endif
@@
-27,10
+28,6
@@
#define _aligned_free __mingw_aligned_free
#endif //MINGW
#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
#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
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
#else
static xbt_os_thread_key_t smx_current_context_key = 0;
#endif