X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9361ad5f13f67578120a74bbbfba718292084cdb..27e8e9f73613b93381c59e87e4c68ec16933b2f0:/include/xbt/graph.h

diff --git a/include/xbt/graph.h b/include/xbt/graph.h
index 8a68dac46b..399bc210d1 100644
--- a/include/xbt/graph.h
+++ b/include/xbt/graph.h
@@ -23,45 +23,45 @@ typedef struct xbt_edge  *xbt_edge_t;
 typedef struct xbt_graph *xbt_graph_t;
 
 /* API */
-XBT_PUBLIC xbt_graph_t xbt_graph_new_graph(unsigned short int directed, void *data);
-XBT_PUBLIC xbt_node_t xbt_graph_new_node(xbt_graph_t g, void *data);
-XBT_PUBLIC xbt_edge_t xbt_graph_new_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst, 
+XBT_PUBLIC(xbt_graph_t) xbt_graph_new_graph(unsigned short int directed, void *data);
+XBT_PUBLIC(xbt_node_t) xbt_graph_new_node(xbt_graph_t g, void *data);
+XBT_PUBLIC(xbt_edge_t) xbt_graph_new_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst, 
 			      void *data);
-XBT_PUBLIC void *xbt_graph_node_get_data(xbt_node_t node);
-XBT_PUBLIC void  xbt_graph_node_set_data(xbt_node_t node, void *data);
-XBT_PUBLIC void *xbt_graph_edge_get_data(xbt_edge_t edge);
-XBT_PUBLIC void  xbt_graph_edge_set_data(xbt_edge_t edge, void *data);
-
-XBT_PUBLIC xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst);
-
-XBT_PUBLIC void xbt_graph_edge_set_length(xbt_edge_t e, double length);
-XBT_PUBLIC double xbt_graph_edge_get_length(xbt_edge_t e);
-XBT_PUBLIC double* xbt_graph_get_length_matrix(xbt_graph_t g);
-
-XBT_PUBLIC void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, 
-			   void_f_pvoid_t *node_free_function , void_f_pvoid_t *edge_free_function);
-XBT_PUBLIC void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, 
-			   void_f_pvoid_t *free_function);
-XBT_PUBLIC void xbt_graph_free_graph(xbt_graph_t g, 
-			  void_f_pvoid_t *node_free_function,
-			  void_f_pvoid_t *edge_free_function,
-			  void_f_pvoid_t *graph_free_function);
-
-XBT_PUBLIC int __xbt_find_in_dynar(xbt_dynar_t dynar, void *p);
-
-XBT_PUBLIC xbt_dynar_t xbt_graph_get_nodes(xbt_graph_t g);
-XBT_PUBLIC xbt_dynar_t xbt_graph_get_edges(xbt_graph_t g);
-XBT_PUBLIC xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e);
-XBT_PUBLIC xbt_node_t xbt_graph_edge_get_target(xbt_edge_t e);
-XBT_PUBLIC xbt_graph_t xbt_graph_read(const char *filename,
+XBT_PUBLIC(void*) xbt_graph_node_get_data(xbt_node_t node);
+XBT_PUBLIC(void)  xbt_graph_node_set_data(xbt_node_t node, void *data);
+XBT_PUBLIC(void*) xbt_graph_edge_get_data(xbt_edge_t edge);
+XBT_PUBLIC(void)  xbt_graph_edge_set_data(xbt_edge_t edge, void *data);
+
+XBT_PUBLIC(xbt_edge_t) xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst);
+
+XBT_PUBLIC(void) xbt_graph_edge_set_length(xbt_edge_t e, double length);
+XBT_PUBLIC(double) xbt_graph_edge_get_length(xbt_edge_t e);
+XBT_PUBLIC(double*) xbt_graph_get_length_matrix(xbt_graph_t g);
+
+XBT_PUBLIC(void) xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, 
+			   void_f_pvoid_t node_free_function , void_f_pvoid_t edge_free_function);
+XBT_PUBLIC(void) xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, 
+			   void_f_pvoid_t free_function);
+XBT_PUBLIC(void) xbt_graph_free_graph(xbt_graph_t g, 
+			  void_f_pvoid_t node_free_function,
+			  void_f_pvoid_t edge_free_function,
+			  void_f_pvoid_t graph_free_function);
+
+XBT_PUBLIC(int) __xbt_find_in_dynar(xbt_dynar_t dynar, void *p);
+
+XBT_PUBLIC(xbt_dynar_t) xbt_graph_get_nodes(xbt_graph_t g);
+XBT_PUBLIC(xbt_dynar_t) xbt_graph_get_edges(xbt_graph_t g);
+XBT_PUBLIC(xbt_node_t) xbt_graph_edge_get_source(xbt_edge_t e);
+XBT_PUBLIC(xbt_node_t) xbt_graph_edge_get_target(xbt_edge_t e);
+XBT_PUBLIC(xbt_graph_t) xbt_graph_read(const char *filename,
 			   void *(node_label_and_data)(xbt_node_t, const char*, const char*),
 			   void *(edge_label_and_data)(xbt_edge_t, const char*, const char*)
 			   );
  
-XBT_PUBLIC void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename,
+XBT_PUBLIC(void) xbt_graph_export_graphviz(xbt_graph_t g, const char *filename,
 			       const char *(node_name)(xbt_node_t),
 			       const char *(edge_name)(xbt_edge_t));
-XBT_PUBLIC void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
+XBT_PUBLIC(void) xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
 			       const char *(node_name)(xbt_node_t),
 			       const char *(edge_name)(xbt_edge_t),
 			       const char *(node_data_print)(void *),
@@ -69,7 +69,7 @@ XBT_PUBLIC void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
 
 /* Not implemented yet ! */
 /* void *xbt_graph_to_array(xbt_graph_t g);  */
-XBT_PUBLIC xbt_node_t* xbt_graph_shortest_paths(xbt_graph_t g);
+XBT_PUBLIC(xbt_node_t*) xbt_graph_shortest_paths(xbt_graph_t g);
 
 
 
@@ -78,9 +78,9 @@ XBT_PUBLIC xbt_node_t* xbt_graph_shortest_paths(xbt_graph_t g);
             if a cycle is detected an exception is raised  
   */
 
-xbt_node_t* xbt_graph_topo_sort(xbt_graph_t g);
+XBT_PUBLIC(xbt_node_t*) xbt_graph_topo_sort(xbt_graph_t g);
 
-xbt_edge_t* xbt_graph_spanning_tree_prim(xbt_graph_t g);
+XBT_PUBLIC(xbt_edge_t*) xbt_graph_spanning_tree_prim(xbt_graph_t g);