X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..1c8c73ef7e2f1307c815cd11071f8c584436f9d5:/include/smpi/mpi.h

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index 4224e7ffbc..671d22ec89 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -9,18 +9,28 @@
 
 #define SEED 221238
 
-#define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x)
-
 #include <smpi/smpi.h>
 #include <xbt/sysdep.h>
 #include <xbt/log.h>
 #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 sleep(x) smpi_sleep(x)
+#define usleep(x) smpi_usleep(x)
+#define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
+#if _POSIX_TIMERS > 0
+#define nanosleep(x, y) smpi_nanosleep(x, y)
+#define clock_gettime(x, y) smpi_clock_gettime(x, y)
+#endif
+#if SIMGRID_HAVE_MC
 #undef assert
 #define assert(x) MC_assert(x)
 #endif
 
+#ifdef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */
+#include <smpi/smpi_extended_traces.h>
+#endif
+
 #endif