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

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index 7adc4b498e..b2c6e2b24e 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-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,9 +9,6 @@
 
 #define SEED 221238
 
-#define sleep(x) smpi_sleep(x)
-#define usleep(x) smpi_usleep(x)
-
 #include <smpi/smpi.h>
 #include <xbt/sysdep.h>
 #include <xbt/log.h>
@@ -19,14 +16,10 @@
 #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 _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
+
+#if SIMGRID_HAVE_MC
 #undef assert
-#define assert(x) MC_assert(x)
+#define assert(x) MC_assert((int)(x))
 #endif
 
 #ifdef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */