Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / smpi_memory.cpp

diff --git a/src/smpi/smpi_memory.cpp b/src/smpi/smpi_memory.cpp
index 0c29b39cae639538792638412265e7389e419030..6893833f4431d036e6d81073566e0cea03db8003 100644 (file)
--- a/src/smpi/smpi_memory.cpp
+++ b/src/smpi/smpi_memory.cpp
@@ -16,14 +16,12 @@
 #include "../xbt/memory_map.hpp"
 
 #include "private.h"
+#include "private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SMPI");
 
-#define TOPAGE(addr) (void *)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize)
-
-#define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC)
-#define PROT_RW (PROT_READ | PROT_WRITE )
-#define PROT_RX (PROT_READ | PROT_EXEC )
+static const int PROT_RWX = (PROT_READ | PROT_WRITE | PROT_EXEC);
+static const int PROT_RW  = (PROT_READ | PROT_WRITE );
 
 void smpi_get_executable_global_size(void)
 {