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
avoid undefined NULL
[simgrid.git]
/
include
/
smpi
/
smpi_helpers.h
diff --git
a/include/smpi/smpi_helpers.h
b/include/smpi/smpi_helpers.h
index
6f279ce
..
9f6f0b5
100644
(file)
--- a/
include/smpi/smpi_helpers.h
+++ b/
include/smpi/smpi_helpers.h
@@
-1,16
+1,17
@@
+#ifndef MPI_HELPERS_H
+#define MPI_HELPERS_H
+
#include <sys/time.h> /* Load it before the define next line to not mess with the system headers */
#define sleep(x) smpi_sleep(x)
#define usleep(x) smpi_usleep(x)
#include <sys/time.h> /* Load it before the define next line to not mess with the system headers */
#define sleep(x) smpi_sleep(x)
#define usleep(x) smpi_usleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x,
NULL
)
+#define gettimeofday(x, y) smpi_gettimeofday(x,
0
)
#if _POSIX_TIMERS > 0
#define nanosleep(x, y) smpi_nanosleep(x, y)
#define clock_gettime(x, y) smpi_clock_gettime(x, y)
#endif
#if _POSIX_TIMERS > 0
#define nanosleep(x, y) smpi_nanosleep(x, y)
#define clock_gettime(x, y) smpi_clock_gettime(x, y)
#endif
-#if SIMGRID_HAVE_MC
-#undef assert
-#define assert(x) MC_assert(x)
-#endif
#define getopt(x,y,z) smpi_getopt(x,y,z)
#define getopt_long(x,y,z,a,b) smpi_getopt_long(x,y,z,a,b)
#define getopt(x,y,z) smpi_getopt(x,y,z)
#define getopt_long(x,y,z,a,b) smpi_getopt_long(x,y,z,a,b)
+
+#endif