#include <xbt/sysdep.h>
#include <simgrid/modelchecker.h>
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_ignore.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
#include "src/mc/ModelChecker.hpp"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
-/** \file mc_client_api.cpp
+/** @file mc_client_api.cpp
*
* This is the implementation of the API used by the user simulated program to
* communicate with the MC (declared in modelchecker.h).
/** @brief Register a stack in the model checker
*
* The stacks are allocated in the heap. The MC handle them especially
- * when we analyse/compare the content of the heap so it must be told where
+ * when we analyze/compare the content of the heap so it must be told where
* they are with this function.
*
* @param stack
* @param context
* @param size Size of the stack
*/
-void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size)
+void MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size)
{
xbt_assert(mc_model_checker == nullptr);
if (!MC_is_active())