resolve cmakelists conflict

[simgrid.git] / teshsuite / msg / trace / test_trace_integration.c

diff --git a/teshsuite/msg/trace/test_trace_integration.c b/teshsuite/msg/trace/test_trace_integration.c
index 396dda2..135509b 100644 (file)
--- a/teshsuite/msg/trace/test_trace_integration.c
+++ b/teshsuite/msg/trace/test_trace_integration.c
@@ -18,7 +18,7 @@ int test_trace(int argc, char *argv[]);
 /** test the trace integration cpu model */
 int test_trace(int argc, char *argv[])
 {
-  m_task_t task;
+  msg_task_t task;
   double task_comp_size = 2800;
   double task_prio = 1.0;
 
@@ -50,7 +50,7 @@ int test_trace(int argc, char *argv[])
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   /* Verify if the platform xml file was passed by command line. */
   MSG_init(&argc, argv);
@@ -67,8 +67,6 @@ int main(int argc, char *argv[])
   /* Run the example. */
   res = MSG_main();
 
-  MSG_clean();
-
   if (res == MSG_OK)
     return 0;
   else