mv src/mc/private.h src/mc/mc_private.h

[simgrid.git] / src / mc / mc_global.c

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 68f11cd175e7f379ef08578bb5e5d6601d15df3e..a0ad3ee77f9ac5eced154a82379f45150d37e46a 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -4,9 +4,9 @@
 #include <sys/time.h>
 
 #include "../surf/surf_private.h"
-#include "../simix/private.h"
+#include "../simix/smx_private.h"
 #include "xbt/fifo.h"
-#include "private.h"
+#include "mc_private.h"
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
@@ -185,7 +185,7 @@ void MC_wait_for_requests(void)
     SIMIX_process_runall();
     xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
       req = &process->simcall;
-      if (req->call != REQ_NO_REQ && !MC_request_is_visible(req))
+      if (req->call != SIMCALL_NONE && !MC_request_is_visible(req))
           SIMIX_simcall_pre(req, 0);
     }
   }
@@ -198,7 +198,7 @@ int MC_deadlock_check()
   if(xbt_swag_size(simix_global->process_list)){
     deadlock = TRUE;
     xbt_swag_foreach(process, simix_global->process_list){
-      if(process->simcall.call != REQ_NO_REQ
+      if(process->simcall.call != SIMCALL_NONE
          && MC_request_is_enabled(&process->simcall)){
         deadlock = FALSE;
         break;