X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Futils.h;h=816c0ad6a53389ca4c908f124c1441f29f1446a1;hb=003f30daef99cca03c6c8bce4224e2e6d3d0480f;hp=488251ce90de9f8ba8a72d3ed2f62e9603471daf;hpb=57952005b6a6a0aeb1e4ecb0d7ac0c6786d23dba;p=babeltrace.git

diff --git a/src/ctf-writer/utils.h b/src/ctf-writer/utils.h
index 488251ce..816c0ad6 100644
--- a/src/ctf-writer/utils.h
+++ b/src/ctf-writer/utils.h
@@ -21,9 +21,9 @@
  * SOFTWARE.
  */
 
-#include "common/babeltrace.h"
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/event.h>
+#include "common/macros.h"
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/event.h>
 #include <stdint.h>
 
 #include "field-path.h"
@@ -36,9 +36,6 @@ struct bt_ctf_search_query {
 	int found;
 };
 
-BT_HIDDEN
-const char *bt_ctf_get_byte_order_string(enum bt_ctf_byte_order byte_order);
-
 static inline
 const char *bt_ctf_field_type_id_string(enum bt_ctf_field_type_id type_id)
 {
@@ -200,13 +197,13 @@ GString *bt_ctf_field_path_string(struct bt_ctf_field_path *path)
 	GString *str = g_string_new(NULL);
 	size_t i;
 
-	BT_ASSERT(path);
+	BT_ASSERT_DBG(path);
 
 	if (!str) {
 		goto end;
 	}
 
-	g_string_append_printf(str, "[%s", bt_common_scope_string(
+	g_string_append_printf(str, "[%s", bt_ctf_scope_string(
 		bt_ctf_field_path_get_root_scope(path)));
 
 	for (i = 0; i < bt_ctf_field_path_get_index_count(path); i++) {