X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace.h;h=8091ac441d9d758f9d7a1c4897d7b2fc9c815b22;hb=e7c058b4112fd7120ed4e63d7cd2033a98eead1d;hp=b4de12f5e973ffcda399545233dae14c12ab6219;hpb=b522ac189ce3ed368594d466461d2eb33025f75d;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index b4de12f5..8091ac44 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -2,14 +2,7 @@
 #define _BABELTRACE_H
 
 #include <stdio.h>
-
-#define BABELTRACE_VERSION_MAJOR	0
-#define BABELTRACE_VERSION_MINOR	1
-
-#ifndef __stringify
-#define __stringify_1(a...)	#a
-#define __stringify(a...)	__stringify_1(a)
-#endif
+#include <glib.h>
 
 extern int babeltrace_verbose, babeltrace_debug;
 
@@ -26,8 +19,13 @@ extern int babeltrace_verbose, babeltrace_debug;
 	} while (0)
 
 struct trace_descriptor;
+struct trace_collection {
+	GPtrArray *array;
+};
 
 int convert_trace(struct trace_descriptor *td_write,
-		  struct trace_descriptor *td_read);
+		  struct trace_collection *trace_collection_read);
+
+extern int opt_field_names;
 
 #endif