From: degomme <augustin.degomme@unibas.ch>
Date: Sun, 19 Jun 2016 11:46:18 +0000 (+0200)
Subject: Only on macos, these defines were actually ignored.
X-Git-Tag: v3_14~944
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b5fccb9ee8a7ceeaac12a51a9963e0be26247971?ds=sidebyside

Only on macos, these defines were actually ignored.
---

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index 7adc4b498e..5021574a10 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -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,6 +16,9 @@
 #include <simgrid/modelchecker.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)
 #define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
 #if _POSIX_TIMERS > 0
 #define nanosleep(x, y) smpi_nanosleep(x, y)