From: Jérémie Galarneau Date: Tue, 3 May 2016 20:00:09 +0000 (-0400) Subject: Fix: invalid mix of ctf_type_id and bt_ctf_scope enums X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e2d83ebb63fd56ee752ab260826c5d11098cfdb5;p=deliverable%2Fbabeltrace.git Fix: invalid mix of ctf_type_id and bt_ctf_scope enums Signed-off-by: Jérémie Galarneau --- diff --git a/formats/ctf/ir/resolve.c b/formats/ctf/ir/resolve.c index 33947598b..4bc4130f9 100644 --- a/formats/ctf/ir/resolve.c +++ b/formats/ctf/ir/resolve.c @@ -1087,7 +1087,7 @@ end: * Resolves the root field type corresponding to the scope `root_scope`. */ static -int resolve_root_type(enum ctf_type_id root_scope, struct resolve_context *ctx) +int resolve_root_type(enum bt_ctf_scope root_scope, struct resolve_context *ctx) { int ret;