move defines frmpo smpi.h to mpi.h, to avoid using them when compiling smpi (the...

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index b08f1ce..b626e5b 100644 (file)
--- 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 567cafa..784a186 100644 (file)
--- 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) \