Removes the gras_config.h inclusion, adds the portable.h inclusion for win32 portability.

[simgrid.git] / src / gras / DataDesc / datadesc_private.h

diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h
index 82d77a8..7255748 100644 (file)
--- a/src/gras/DataDesc/datadesc_private.h
+++ b/src/gras/DataDesc/datadesc_private.h
@@ -20,7 +20,7 @@
 #include "xbt/dict.h"
 #include "xbt/set.h"
 
-#include "gras_config.h" /* GRAS_THISARCH */
+#include "portable.h" /* GRAS_THISARCH */
 
 #include "gras/transport.h"  /* socket handling */
 
@@ -30,11 +30,11 @@
 #include "gras/DataDesc/datadesc_interface.h" /* semi-public API */
 
 /**
- * aligned:
+ * ddt_aligned:
  * 
  * Align the data v on the boundary a.
  */
-#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
+#define ddt_aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
 
 /*@null@*/extern xbt_set_t gras_datadesc_set_local;
 void gras_ddt_freev(void *ddt);
@@ -258,5 +258,10 @@ gras_dd_convert_elm(gras_datadesc_type_t type, int count,
                    int r_arch, 
                    void *src, void *dst);
 
+/********************************************************************
+ * Dictionnary containing the constant values for the parsing macro *
+ ********************************************************************/
+extern xbt_dict_t gras_dd_constants; /* lives in ddt_parse.c of course */
+
 #endif /* GRAS_DATADESC_PRIVATE_H */