X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=2f15a681a8db5ccdc550e9f8ba37d13474972295;hb=40af9f9fb5d827c8c58e32efd6fca204da1194c8;hp=1f379ee7719d53de5c013c586783357f1f283d73;hpb=9a7f65a34e9358633109338f12bb52303c358d35;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 1f379ee7..2f15a681 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -151,6 +151,14 @@ extern int babeltrace_verbose, babeltrace_debug;
 # endif
 #endif
 
+#ifndef min
+#define min(a, b)	(((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b)	(((a) > (b)) ? (a) : (b))
+#endif
+
 /*
  * BT_HIDDEN: set the hidden attribute for internal functions
  */
@@ -164,8 +172,8 @@ struct trace_collection {
 	GPtrArray *array;	/* struct bt_trace_descriptor */
 	GHashTable *clocks;	/* struct ctf_clock */
 
-	uint64_t single_clock_offset_avg;
-	uint64_t offset_first;
+	int64_t single_clock_offset_avg;
+	int64_t offset_first;
 	int64_t delta_offset_first_sum;
 	int offset_nr;
 	int clock_use_offset_avg;
@@ -191,9 +199,13 @@ extern int opt_all_field_names,
 	opt_clock_seconds,
 	opt_clock_date,
 	opt_clock_gmt,
-	opt_clock_force_correlate;
-
-extern uint64_t opt_clock_offset;
-extern uint64_t opt_clock_offset_ns;
+	opt_clock_force_correlate,
+	opt_debug_info_full_path;
+
+extern int64_t opt_clock_offset;
+extern int64_t opt_clock_offset_ns;
+extern int babeltrace_ctf_console_output;
+extern char *opt_debug_info_dir;
+extern char *opt_debug_info_target_prefix;
 
 #endif