X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa89cb46ee9cce80179056e44c26ca5de4c4ac9c..afc18311103790110523e82419e38cdba65e1177:/include/smpi/mpi.h

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index e8aa3eae90..7adc4b498e 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2012. 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
@@ -10,7 +10,7 @@
 #define SEED 221238
 
 #define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x)
+#define usleep(x) smpi_usleep(x)
 
 #include <smpi/smpi.h>
 #include <xbt/sysdep.h>
@@ -18,9 +18,19 @@
 #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 _POSIX_TIMERS > 0
+#define nanosleep(x, y) smpi_nanosleep(x, y)
+#define clock_gettime(x, y) smpi_clock_gettime(x, y)
+#endif
+#if 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