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

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index a5474a6fe1..d609d3d011 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -9,8 +9,6 @@
 
 #define SEED 221238
 
-#define sleep(x) smpi_sleep(x)
-
 #include <smpi/smpi.h>
 #include <xbt/sysdep.h>
 #include <xbt/log.h>
@@ -18,16 +16,14 @@
 #include <simgrid/modelchecker.h>
 
 #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
+#if SIMGRID_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"
+#ifdef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */
+#include <smpi/smpi_extended_traces.h>
 #endif
 
 #endif