From 24d67cebdedcbdd59000ed9439c1a8c51cd98a24 Mon Sep 17 00:00:00 2001 From: degomme Date: Tue, 3 Apr 2018 22:33:11 +0200 Subject: [PATCH] avoid undefined NULL --- include/smpi/mpi.h | 7 ------- include/smpi/smpi_helpers.h | 11 ++++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h index 671d22ec89..d609d3d011 100644 --- a/include/smpi/mpi.h +++ b/include/smpi/mpi.h @@ -17,13 +17,6 @@ #include /* 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) -#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) diff --git a/include/smpi/smpi_helpers.h b/include/smpi/smpi_helpers.h index 6f279ceee4..9f6f0b5333 100644 --- 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 /* 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 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) + +#endif -- 2.20.1