X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..70db2cf7d113ef129c04aedb4fb3451d8f2ba96b:/include/smpi/mpi.h?ds=sidebyside

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index 4224e7ffbc..a04fd98c29 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-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,18 +9,21 @@
 
 #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 */
+
+#if SIMGRID_HAVE_MC
 #undef assert
-#define assert(x) MC_assert(x)
+#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