From 20b7e2968d06b068b91ed97762e8f0c9537b647e Mon Sep 17 00:00:00 2001
From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Wed, 31 Oct 2012 15:18:19 +0100
Subject: [PATCH] move defines frmpo smpi.h to mpi.h, to avoid using them when
 compiling smpi (the sleep one did weird things on macos platforms). They
 should be used for client codes only

---
 include/smpi/mpi.h  | 3 +++
 include/smpi/smpi.h | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index b08f1cea63..b626e5bd16 100644
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -9,6 +9,9 @@
 
 #define SEED 221238
 
+#define sleep(x) smpi_sleep(x)
+#define gettimeofday(x, y) smpi_gettimeofday(x, y)
+
 #include <smpi/smpi.h>
 #include <xbt/sysdep.h>
 #include <xbt/log.h>
diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 567cafa3b4..784a186942 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -12,8 +12,6 @@
 #include <xbt/misc.h>
 #include <xbt/function_types.h>
 
-#define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x, y)
 
 #ifdef _WIN32
 #define MPI_CALL(type,name,args) \
-- 
2.20.1