lib: Reset libbabeltrace2 to SONANE 0

[babeltrace.git] / include / babeltrace / graph / self-component-source.h

diff --git a/include/babeltrace/graph/self-component-source.h b/include/babeltrace/graph/self-component-source.h
index b9f148b5de97794356fd6566a6f4f995cae37648..5fdee3f33e416bc884277f64ed6d1144c61a389f 100644 (file)
--- a/include/babeltrace/graph/self-component-source.h
+++ b/include/babeltrace/graph/self-component-source.h
@@ -25,48 +25,49 @@
 
 #include <stdint.h>
 
-/* For enum bt_self_component_status */
+/* For bt_self_component_status */
 #include <babeltrace/graph/self-component.h>
 
+/*
+ * For bt_component_source, bt_self_component, bt_self_component_source,
+ * bt_self_component_port_output, __BT_UPCAST, __BT_UPCAST_CONST
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component_source;
-struct bt_self_component;
-struct bt_self_component_source;
-struct bt_self_component_port_output;
-
 static inline
-struct bt_self_component *bt_self_component_source_as_self_component(
-               struct bt_self_component_source *self_comp_source)
+bt_self_component *bt_self_component_source_as_self_component(
+               bt_self_component_source *self_comp_source)
 {
-       return (void *) self_comp_source;
+       return __BT_UPCAST(bt_self_component, self_comp_source);
 }
 
 static inline
-const struct bt_component_source *
+const bt_component_source *
 bt_self_component_source_as_component_source(
-               struct bt_self_component_source *self_comp_source)
+               bt_self_component_source *self_comp_source)
 {
-       return (const void *) self_comp_source;
+       return __BT_UPCAST_CONST(bt_component_source, self_comp_source);
 }
 
-extern struct bt_self_component_port_output *
+extern bt_self_component_port_output *
 bt_self_component_source_borrow_output_port_by_name(
-               struct bt_self_component_source *self_component,
+               bt_self_component_source *self_component,
                const char *name);
 
-extern struct bt_self_component_port_output *
+extern bt_self_component_port_output *
 bt_self_component_source_borrow_output_port_by_index(
-               struct bt_self_component_source *self_component,
+               bt_self_component_source *self_component,
                uint64_t index);
 
-extern enum bt_self_component_status
+extern bt_self_component_status
 bt_self_component_source_add_output_port(
-               struct bt_self_component_source *self_component,
+               bt_self_component_source *self_component,
                const char *name, void *user_data,
-               struct bt_self_component_port_output **self_component_port);
+               bt_self_component_port_output **self_component_port);
 
 #ifdef __cplusplus
 }