gosh, so much cruft in this code

[simgrid.git] / include / simgrid / link.h

diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index 538d378..4865236 100644 (file)
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -9,23 +9,7 @@
 #ifndef INCLUDE_SIMGRID_LINK_H_
 #define INCLUDE_SIMGRID_LINK_H_
 
-
-#ifdef __cplusplus
-
-namespace simgrid {
-namespace surf {
-
-class Link;
-
-}
-}
-typedef simgrid::surf::Link Link;
-
-#else
-typedef struct Link Link;
-#endif
-
-
+#include <simgrid/forward.h>
 
 /* C interface */
 SG_BEGIN_DECL()
@@ -36,9 +20,9 @@ XBT_PUBLIC(double) sg_link_bandwidth(Link *link);
 XBT_PUBLIC(double) sg_link_latency(Link *link);
 XBT_PUBLIC(void*) sg_link_data(Link *link);
 XBT_PUBLIC(void) sg_link_data_set(Link *link,void *data);
-XBT_PUBLIC(int) sg_link_amount(void);
-XBT_PUBLIC(Link**) sg_link_list(void);
-XBT_PUBLIC(void) sg_link_exit(void);
+XBT_PUBLIC(int) sg_link_count();
+XBT_PUBLIC(Link**) sg_link_list();
+XBT_PUBLIC(void) sg_link_exit();
 SG_END_DECL()
 
 #endif /* INCLUDE_SIMGRID_LINK_H_ */