[SMPI] Remove outcommented include from mpi.h

[simgrid.git] / include / smpi / mpi.h

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index 4224e7f..5ddbfa3 100644 (file)
--- 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,16 @@
 #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 <smpi/smpi_extended_traces.h>
+#endif
+
 #endif