X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..421c3ca52031a1c231fb91ec35dafa0e88050242:/include/smpi/mpi.h

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index b295aac041..5bfe31a43e 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,15 +9,20 @@
 
 #define SEED 221238
 
+#define sleep(x) smpi_sleep(x)
+
 #include <smpi/smpi.h>
 #include <xbt/sysdep.h>
 #include <xbt/log.h>
 #include <xbt/asserts.h>
+#include <simgrid/modelchecker.h>
 
-/*
-#define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x, y)
-#define main(x, y) smpi_simulated_main(x, y)
-*/
+#include <sys/time.h> /* Load it before the define next line to not mess with the system headers */
+#define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
+
+#ifdef HAVE_MC
+#undef assert
+#define assert(x) MC_assert(x)
+#endif
 
 #endif