X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=78adefce346e40bd2dc82d964ebf31fc1730acd2;hb=cba1661ca1dbb97c676e5318106ae23052be947c;hp=7c02948ac1ff56fda5e016204a834dbf59f41f0b;hpb=70bd0a12b09ce7f233189cf07e090fda593ebc48;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 7c02948a..78adefce 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -18,6 +18,9 @@ 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;
@@ -26,6 +29,10 @@ struct trace_collection {
 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;
 
 #endif