Fix double typedef of bt_event_name

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

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 7c02948ac1ff56fda5e016204a834dbf59f41f0b..1c12a8be23f2ec7cb6687a3b539a90b27eb09573 100644 (file)
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -18,14 +18,24 @@ extern int babeltrace_verbose, babeltrace_debug;
                        printf("[debug] " fmt, ## args);        \
        } while (0)
 
+#define likely(x)      __builtin_expect(!!(x), 1)
+#define unlikely(x)    __builtin_expect(!!(x), 0)
+
 struct trace_descriptor;
 struct trace_collection {
-       GPtrArray *array;
+       GPtrArray *array; /* struct trace_descriptor */
 };
 
-int convert_trace(struct trace_descriptor *td_write,
-                 struct trace_collection *trace_collection_read);
-
-extern int opt_field_names;
+extern int opt_all_field_names,
+       opt_scope_field_names,
+       opt_header_field_names,
+       opt_context_field_names,
+       opt_payload_field_names,
+       opt_trace_name,
+       opt_trace_domain,
+       opt_trace_procname,
+       opt_trace_vpid,
+       opt_loglevel,
+       opt_delta;
 
 #endif