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

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index 2cb6aca2b4..36691fb3d3 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -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,11 +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
 
+#ifdef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */
+#include <smpi/smpi_extended_traces.h>
+#endif
+
 #endif