Merge branch 'master' into mc

[simgrid.git] / src / simix / smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 2689131..afbc67c 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -13,11 +13,11 @@
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "mc/mc.h"
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "mc/mc.h"

+#include "mc/mc_replay.h"

 #include "simgrid/sg_config.h"
 
 #ifdef HAVE_MC
 #include "mc/mc_private.h"
 #include "simgrid/sg_config.h"
 
 #ifdef HAVE_MC
 #include "mc/mc_private.h"

-#include "mc/mc_model_checker.h"

 #include "mc/mc_protocol.h"
 #include "mc/mc_client.h"
 #endif
 #include "mc/mc_protocol.h"
 #include "mc/mc_client.h"
 #endif


@@ -220,8 +220,6 @@ void SIMIX_global_init(int *argc, char **argv)
       MC_client_init();
       MC_client_hello();
       MC_client_handle_messages();
       MC_client_init();
       MC_client_hello();
       MC_client_handle_messages();

-    } else {
-      mc_mode = MC_MODE_STANDALONE;

     }
   }
 #endif
     }
   }
 #endif