Typedef bt_intern_str

[babeltrace.git] / include / babeltrace / format.h

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 5cf795a76418f5f281b826a5f33b455e001dec93..f680dfa7ceb4e76aec8d4ecb380a09e8947b6174 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -21,11 +21,14 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <babeltrace/types.h>
-#include <babeltrace/ctf/types.h>
+#include <babeltrace/list.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
+
+typedef int bt_intern_str;
+
+/* forward declaration */
+struct ctf_stream_pos;
 
 /* Parent trace descriptor */
 struct trace_descriptor {
@@ -33,15 +36,15 @@ struct trace_descriptor {
 
 struct mmap_stream {
        int fd;
-       struct cds_list_head list;
+       struct bt_list_head list;
 };
 
 struct mmap_stream_list {
-       struct cds_list_head head;
+       struct bt_list_head head;
 };
 
 struct format {
-       GQuark name;
+       bt_intern_str name;
 
        struct trace_descriptor *(*open_trace)(const char *path, int flags,
                        void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
@@ -53,7 +56,7 @@ struct format {
        void (*close_trace)(struct trace_descriptor *descriptor);
 };
 
-extern struct format *bt_lookup_format(GQuark qname);
+extern struct format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct format *format);