#include <atomic>
-#include "internal_config.h"
+#include "src/internal_config.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include "xbt/dynar.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/sysdep.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map");
#endif
case XBT_PARMAP_BUSY_WAIT:
-#ifndef _MSV_VER
+#ifndef _MSC_VER
parmap->master_wait_f = xbt_parmap_busy_master_wait;
parmap->worker_signal_f = xbt_parmap_busy_worker_signal;
parmap->master_signal_f = xbt_parmap_busy_master_signal;