/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "portable.h"
+#include "src/portable.h"
#include "xbt/log.h"
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "smx_private.h"
#include "simgrid/sg_config.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
#include "simgrid/modelchecker.h"
#ifdef _WIN32
#include <windows.h>
+#include <malloc.h>
#else
#include <sys/mman.h>
#endif
#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
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