A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics in the ChangeLog
[simgrid.git]
/
include
/
smpi
/
mpi.h
diff --git
a/include/smpi/mpi.h
b/include/smpi/mpi.h
index
4224e7f
..
5bfe31a
100644
(file)
--- a/
include/smpi/mpi.h
+++ b/
include/smpi/mpi.h
@@
-10,7
+10,6
@@
#define SEED 221238
#define sleep(x) smpi_sleep(x)
#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 <smpi/smpi.h>
#include <xbt/sysdep.h>
@@
-18,6
+17,9
@@
#include <xbt/asserts.h>
#include <simgrid/modelchecker.h>
#include <xbt/asserts.h>
#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)
+
#ifdef HAVE_MC
#undef assert
#define assert(x) MC_assert(x)
#ifdef HAVE_MC
#undef assert
#define assert(x) MC_assert(x)