X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..772f8dd3b48f0c9dff20f67a4c2ea1cbbe673f8d:/include/smpi/mpi.h

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index 4224e7ffbc..a5474a6fe1 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -10,7 +10,6 @@
 #define SEED 221238
 
 #define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x)
 
 #include <smpi/smpi.h>
 #include <xbt/sysdep.h>
@@ -18,9 +17,17 @@
 #include <xbt/asserts.h>
 #include <simgrid/modelchecker.h>
 
-#ifdef HAVE_MC
+#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)
+
+#if HAVE_MC
 #undef assert
 #define assert(x) MC_assert(x)
 #endif
 
+#if TRACE_CALL_LOCATION
+#include "src/instr/instr_smpi.h"
+#include "smpi_extended_traces.h"
+#endif
+
 #endif