Fix: swapped libelf and libdw names in configure error message

[babeltrace.git] / types / enum.c

diff --git a/types/enum.c b/types/enum.c
index 6d3371395621a9e3a78737509788d069b1b38502..8394e1b35b70b4e2c58b2a9d9ed97d1293eb2c3c 100644 (file)
--- a/types/enum.c
+++ b/types/enum.c
@@ -41,12 +41,12 @@
 #endif
 
 static
-struct definition *_enum_definition_new(struct declaration *declaration,
+struct bt_definition *_enum_definition_new(struct bt_declaration *declaration,
                                        struct definition_scope *parent_scope,
                                        GQuark field_name, int index,
                                        const char *root_name);
 static
-void _enum_definition_free(struct definition *definition);
+void _enum_definition_free(struct bt_definition *definition);
 
 static
 void enum_range_set_free(void *ptr)
@@ -374,7 +374,7 @@ size_t bt_enum_get_nr_enumerators(struct declaration_enum *enum_declaration)
 }
 
 static
-void _enum_declaration_free(struct declaration *declaration)
+void _enum_declaration_free(struct bt_declaration *declaration)
 {
        struct declaration_enum *enum_declaration =
                container_of(declaration, struct declaration_enum, p);
@@ -417,8 +417,8 @@ struct declaration_enum *
 }
 
 static
-struct definition *
-       _enum_definition_new(struct declaration *declaration,
+struct bt_definition *
+       _enum_definition_new(struct bt_declaration *declaration,
                             struct definition_scope *parent_scope,
                             GQuark field_name, int index,
                             const char *root_name)
@@ -426,7 +426,7 @@ struct definition *
        struct declaration_enum *enum_declaration =
                container_of(declaration, struct declaration_enum, p);
        struct definition_enum *_enum;
-       struct definition *definition_integer_parent;
+       struct bt_definition *definition_integer_parent;
        int ret;
 
        _enum = g_new(struct definition_enum, 1);
@@ -440,10 +440,10 @@ struct definition *
         */
        _enum->p.index = root_name ? INT_MAX : index;
        _enum->p.name = field_name;
-       _enum->p.path = new_definition_path(parent_scope, field_name, root_name);
-       _enum->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+       _enum->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
+       _enum->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name);
        _enum->value = NULL;
-       ret = register_field_definition(field_name, &_enum->p,
+       ret = bt_register_field_definition(field_name, &_enum->p,
                                        parent_scope);
        assert(!ret);
        definition_integer_parent =
@@ -456,13 +456,13 @@ struct definition *
 }
 
 static
-void _enum_definition_free(struct definition *definition)
+void _enum_definition_free(struct bt_definition *definition)
 {
        struct definition_enum *_enum =
                container_of(definition, struct definition_enum, p);
 
        bt_definition_unref(&_enum->integer->p);
-       free_definition_scope(_enum->p.scope);
+       bt_free_definition_scope(_enum->p.scope);
        bt_declaration_unref(_enum->p.declaration);
        if (_enum->value)
                g_array_unref(_enum->value);