fix some more MC examples

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

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index e62b9c6..8713d54 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -13,9 +12,9 @@
 
 #include <vector>
 
-#include <xbt/dynar.h>
-#include <xbt/automaton.h>
-#include <xbt/swag.h>
+#include "xbt/automaton.h"
+#include "xbt/dynar.h"
+#include "xbt/swag.h"
 
 #include "mc_base.h"
 
@@ -29,7 +28,7 @@
 
 #include "src/simix/ActorImpl.hpp"
 
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
 #include <libunwind.h>
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_request.h"
@@ -56,7 +55,7 @@ std::vector<double> processes_time;
 }
 }
 
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
 
 /* Liveness */
 
@@ -105,7 +104,7 @@ void MC_run()
   simgrid::mc::processes_time.clear();
 }
 
-void MC_show_deadlock(void)
+void MC_show_deadlock()
 {
   XBT_INFO("**************************");
   XBT_INFO("*** DEAD-LOCK DETECTED ***");
@@ -134,7 +133,7 @@ void dumpStack(FILE* file, unw_cursor_t cursor)
 
   unw_word_t off;
   do {
-    const char * name = !unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
+    const char* name = not unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
 
     int status;