Rename BEGIN_DECL since we changed the usual definition to a macro with arguments...

[simgrid.git] / include / gras / datadesc.h

diff --git a/include/gras/datadesc.h b/include/gras/datadesc.h
index 4d82e96d02fe4dd460e05472c3256d9bca845be2..31a4e3604a0d58b0a61ab5c41f80ca2d1f858562 100644 (file)
--- a/include/gras/datadesc.h
+++ b/include/gras/datadesc.h
@@ -10,10 +10,10 @@
 #ifndef GRAS_DATADESC_H
 #define GRAS_DATADESC_H
 
-#include "xbt/misc.h" /* BEGIN_DECL */
+#include "xbt/misc.h" /* SG_BEGIN_DECL */
 #include "xbt/dynar.h" /* void_f_pvoid_t */
 
-BEGIN_DECL()
+SG_BEGIN_DECL()
 
 /** @addtogroup GRAS_dd Data description
  *  @brief Describing data to be exchanged (Communication facility)
@@ -302,31 +302,25 @@ void gras_datadesc_cb_push_ulint(gras_datadesc_type_t typedesc, gras_cbps_t vars
 
 /* @{ */
 
-xbt_error_t
-  gras_cbps_v_pop (gras_cbps_t            ps, 
-                  const char            *name,
-        /* OUT */ gras_datadesc_type_t  *ddt,
-        /* OUT */ void                 **res);
-xbt_error_t
-gras_cbps_v_push(gras_cbps_t            ps,
-                const char            *name,
-                void                  *data,
-                gras_datadesc_type_t   ddt);
-void
-gras_cbps_v_set (gras_cbps_t            ps,
-                const char            *name,
-                void                  *data,
-                gras_datadesc_type_t   ddt);
-
-void *
-gras_cbps_v_get (gras_cbps_t            ps, 
-                const char            *name,
-       /* OUT */ gras_datadesc_type_t  *ddt);
-
-void
-gras_cbps_block_begin(gras_cbps_t ps);
-void
-gras_cbps_block_end(gras_cbps_t ps);
+void   gras_cbps_v_pop (gras_cbps_t            ps, 
+                       const char            *name,
+             /* OUT */ gras_datadesc_type_t  *ddt,
+             /* OUT */ void                 **res);
+void   gras_cbps_v_push(gras_cbps_t            ps,
+                       const char            *name,
+                       void                  *data,
+                       gras_datadesc_type_t   ddt);
+void   gras_cbps_v_set (gras_cbps_t            ps,
+                       const char            *name,
+                       void                  *data,
+                       gras_datadesc_type_t   ddt);
+
+void * gras_cbps_v_get (gras_cbps_t            ps, 
+                       const char            *name,
+             /* OUT */ gras_datadesc_type_t  *ddt);
+
+void gras_cbps_block_begin(gras_cbps_t ps);
+void gras_cbps_block_end(gras_cbps_t ps);
 
 /* @} */
 /* @} */
@@ -382,13 +376,12 @@ typedef struct DataDescriptorStruct {
   sizeof(structType) - offsetof(structType, lastMember) - \
   sizeof(memberType) * repetitions
 
-xbt_error_t
+gras_datadesc_type_t
 gras_datadesc_import_nws(const char           *name,
                         const DataDescriptor *desc,
-                        unsigned long         howmany,
-              /* OUT */ gras_datadesc_type_t *dst);
+                        unsigned long         howmany);
 
 
-END_DECL()
+SG_END_DECL()
 
 #endif /* GRAS_DATADESC_H */