include/babeltrace/graph: fix some include guards

[babeltrace.git] / include / babeltrace / graph / component-internal.h

diff --git a/include/babeltrace/graph/component-internal.h b/include/babeltrace/graph/component-internal.h
index 35a353a1ba7be28abc8974c05535e801a9a3a11a..f742c7b1717f692bf6dcaca032e0083a2acdfe09 100644 (file)
--- a/include/babeltrace/graph/component-internal.h
+++ b/include/babeltrace/graph/component-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
-#define BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
 
 /*
  * BabelTrace - Component internal
@@ -33,6 +33,7 @@
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/types.h>
+#include <babeltrace/assert-internal.h>
 #include <glib.h>
 #include <stdio.h>
 
@@ -69,7 +70,7 @@ struct bt_component {
 };
 
 static inline
-struct bt_component *bt_component_from_private(
+struct bt_component *bt_component_borrow_from_private(
                struct bt_private_component *private_component)
 {
        return (void *) private_component;
@@ -85,7 +86,7 @@ struct bt_private_component *bt_private_component_from_component(
 static inline
 struct bt_graph *bt_component_borrow_graph(struct bt_component *comp)
 {
-       assert(comp);
+       BT_ASSERT(comp);
        return (void *) comp->base.parent;
 }
 
@@ -184,4 +185,4 @@ const char *bt_component_status_string(enum bt_component_status status)
        }
 }
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_INTERNAL_H */